7148758: Resolve merge issue which caused testcase failure

Reviewed-by: alanb, chegar
2012-02-24 17:31:59 -08:00 · 2012-02-24 17:31:59 -08:00 · c3da3a5048
commit c3da3a5048
parent 162d75c68c
1 changed files with 4 additions and 0 deletions
--- a/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java
+++ b/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java
@ -81,6 +81,10 @@ class ServerConfig {
                    drainAmount = Long.getLong("sun.net.httpserver.drainAmount",
                            DEFAULT_DRAIN_AMOUNT);

+                    maxReqHeaders = Integer.getInteger(
+                            "sun.net.httpserver.maxReqHeaders",
+                            DEFAULT_MAX_REQ_HEADERS);
+
                    maxReqTime = Long.getLong("sun.net.httpserver.maxReqTime",
                            DEFAULT_MAX_REQ_TIME);