changeset 1181:09b17f679cbd

Merge
author dfuchs
date Tue, 10 Mar 2009 12:36:55 +0100
parents 8cdfcdea53cb ea88236be621
children de520a184ddb
files
diffstat 5 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/management/monitor/CounterMonitor.java	Mon Mar 09 22:17:52 2009 +0100
+++ b/src/share/classes/javax/management/monitor/CounterMonitor.java	Tue Mar 10 12:36:55 2009 +0100
@@ -596,7 +596,7 @@
      * types sent by the counter monitor.
      */
     public MBeanNotificationInfo[] getNotificationInfo() {
-        return notifsInfo;
+        return notifsInfo.clone();
     }
 
     /*
--- a/src/share/classes/javax/management/monitor/GaugeMonitor.java	Mon Mar 09 22:17:52 2009 +0100
+++ b/src/share/classes/javax/management/monitor/GaugeMonitor.java	Tue Mar 10 12:36:55 2009 +0100
@@ -478,7 +478,7 @@
      * types sent by the gauge monitor.
      */
     public MBeanNotificationInfo[] getNotificationInfo() {
-        return notifsInfo;
+        return notifsInfo.clone();
     }
 
     /*
--- a/src/share/classes/javax/management/monitor/StringMonitor.java	Mon Mar 09 22:17:52 2009 +0100
+++ b/src/share/classes/javax/management/monitor/StringMonitor.java	Tue Mar 10 12:36:55 2009 +0100
@@ -184,6 +184,7 @@
      * @return The derived gauge of the specified object.
      *
      */
+    @Override
     public synchronized String getDerivedGauge(ObjectName object) {
         return (String) super.getDerivedGauge(object);
     }
@@ -199,6 +200,7 @@
      * @return The derived gauge timestamp of the specified object.
      *
      */
+    @Override
     public synchronized long getDerivedGaugeTimeStamp(ObjectName object) {
         return super.getDerivedGaugeTimeStamp(object);
     }
@@ -341,8 +343,9 @@
      * the Java class of the notification and the notification types sent by
      * the string monitor.
      */
+    @Override
     public MBeanNotificationInfo[] getNotificationInfo() {
-        return notifsInfo;
+        return notifsInfo.clone();
     }
 
     /*
--- a/src/share/classes/sun/net/httpserver/Request.java	Mon Mar 09 22:17:52 2009 +0100
+++ b/src/share/classes/sun/net/httpserver/Request.java	Tue Mar 10 12:36:55 2009 +0100
@@ -52,6 +52,9 @@
         os = rawout;
         do {
             startLine = readLine();
+            if (startLine == null) {
+                return;
+            }
             /* skip blank lines */
         } while (startLine.equals (""));
     }
--- a/src/share/classes/sun/net/httpserver/ServerImpl.java	Mon Mar 09 22:17:52 2009 +0100
+++ b/src/share/classes/sun/net/httpserver/ServerImpl.java	Tue Mar 10 12:36:55 2009 +0100
@@ -441,6 +441,7 @@
                         rawin = sslStreams.getInputStream();
                         rawout = sslStreams.getOutputStream();
                         engine = sslStreams.getSSLEngine();
+                        connection.sslStreams = sslStreams;
                     } else {
                         rawin = new BufferedInputStream(
                             new Request.ReadStream (
@@ -450,6 +451,8 @@
                             ServerImpl.this, chan
                         );
                     }
+                    connection.raw = rawin;
+                    connection.rawout = rawout;
                 }
                 Request req = new Request (rawin, rawout);
                 requestLine = req.requestLine();