Merge

.hgtags

@@ -244,6 +244,7 @@ e4499a6529e8c3e762ba86f45cdd774c92a8e7bc jdk8-b119
 d31cd980e1da31fa496a359caaf1a165aeb5791a jdk8-b120
 ce05e132b1370fe8a66ab9373014d12328c591c4 jdk8-b121
 e1499442453b6b70af6c2b496fa6d364f68c1d12 jdk8-b122
+484e16c0a040efeccbe449d163e9c185e6c2b4db jdk8-b123
 fa2d5a06308f3f36fb09662fa58070a02352f023 jdk8u5-b01
 343f4f8ba0982b3516e33c859b01634d919243c4 jdk8u5-b02
 c35571198602a5856280d5c7c10bda4e7b769104 jdk8u5-b03

make/gensrc/GensrcSwing.gmk

@@ -77,7 +77,7 @@ $(JDK_OUTPUTDIR)/gensrc_no_srczip/_the.generated_beaninfo: $(BEANS_SRC) \
 	$(ECHO) Generating beaninfo
 	$(MKDIR) -p $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing
 	$(JAVA) -Djava.awt.headless=true $(NEW_JAVADOC) \
-	    -sourcepath "$(JDK_TOPDIR)/src/share/classes$(PATH_SEP)$(JDK_OUTPUTDIR)/gensrc" \
+	    -sourcepath "$(JDK_TOPDIR)/src/share/classes$(PATH_SEP)$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes$(PATH_SEP)$(JDK_OUTPUTDIR)/gensrc" \
 	    -doclet build.tools.swingbeaninfo.GenDocletBeanInfo \
 	    -x $(SWINGBEAN_DEBUG_FLAG) -d $(JDK_OUTPUTDIR)/gensrc_no_srczip/javax/swing \
 	    -t $(DOCLET_DATA_DIR)/SwingBeanInfo.template -docletpath $(JDK_OUTPUTDIR)/btclasses \

src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java

@@ -543,8 +543,8 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
              */
             if (!failedOnce) {
                 checkURLFile();
-                requests.prepend(method + " " + getRequestURI() + " " +
-                    httpVersion, null);
+                requests.prepend(method + " " + getRequestURI()+" "  +
+                                 httpVersion, null);
             }
             if (!getUseCaches()) {
                 requests.setIfNotSet ("Cache-Control", "no-cache");