# HG changeset patch
# User iignatyev
# Date 1417461722 -10800
# Node ID 5b202512698a342fbab11829b3438873d1dd2579
# Parent  eb64f15b30854cf7ee69ac8bf5ae9bb2b7f33dd8# Parent  e269428daa22cd9abe43fd3f609812a382804419
Merge

diff -r eb64f15b3085 -r 5b202512698a jdk/src/java.base/share/classes/java/nio/file/Path.java
--- a/jdk/src/java.base/share/classes/java/nio/file/Path.java	Mon Dec 01 21:58:46 2014 +0300
+++ b/jdk/src/java.base/share/classes/java/nio/file/Path.java	Mon Dec 01 22:22:02 2014 +0300
@@ -325,7 +325,7 @@
      *
      * @return  the resulting path or this path if it does not contain
      *          redundant name elements; an empty path is returned if this path
-     *          does have a root component and all name elements are redundant
+     *          does not have a root component and all name elements are redundant
      *
      * @see #getParent
      * @see #toRealPath
diff -r eb64f15b3085 -r 5b202512698a jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java
--- a/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java	Mon Dec 01 21:58:46 2014 +0300
+++ b/jdk/src/java.sql.rowset/share/classes/javax/sql/rowset/BaseRowSet.java	Mon Dec 01 22:22:02 2014 +0300
@@ -462,7 +462,7 @@
      * <code>false</code> that it is not. The default is <code>true</code>.
      * @serial
      */
-    private boolean escapeProcessing;
+    private boolean escapeProcessing = true;
 
     /**
      * A constant indicating the isolation level of the connection
diff -r eb64f15b3085 -r 5b202512698a jdk/src/java.sql/share/classes/java/sql/Connection.java
--- a/jdk/src/java.sql/share/classes/java/sql/Connection.java	Mon Dec 01 21:58:46 2014 +0300
+++ b/jdk/src/java.sql/share/classes/java/sql/Connection.java	Mon Dec 01 22:22:02 2014 +0300
@@ -1116,7 +1116,7 @@
          *
          * @return true if the connection is valid, false otherwise
          * @exception SQLException if the value supplied for <code>timeout</code>
-         * is less then 0
+         * is less than 0
          * @since 1.6
          *
          * @see java.sql.DatabaseMetaData#getClientInfoProperties
diff -r eb64f15b3085 -r 5b202512698a jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java
--- a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java	Mon Dec 01 21:58:46 2014 +0300
+++ b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java	Mon Dec 01 22:22:02 2014 +0300
@@ -206,11 +206,13 @@
         if (timer1Enabled) {
             timer1.cancel();
         }
-        try {
-            dispatcherThread.join();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            logger.log(Level.FINER, "ServerImpl.stop: ", e);
+        if (dispatcherThread != null) {
+            try {
+                dispatcherThread.join();
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                logger.log(Level.FINER, "ServerImpl.stop: ", e);
+            }
         }
     }
 
diff -r eb64f15b3085 -r 5b202512698a jdk/test/com/sun/net/httpserver/StopNoStartTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/net/httpserver/StopNoStartTest.java	Mon Dec 01 22:22:02 2014 +0300
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8066130
+ * @summary  Test HttpServer stop method invocation before a start has been called
+ */
+
+import java.net.InetSocketAddress;
+import com.sun.net.httpserver.HttpServer;
+
+
+public class StopNoStartTest {
+
+    public static void main(String[] args) throws Exception {
+
+        InetSocketAddress serverAddr = new InetSocketAddress(0);
+        HttpServer server = HttpServer.create(serverAddr, 0);
+        server.stop(0);
+    }
+}
diff -r eb64f15b3085 -r 5b202512698a jdk/test/javax/sql/testng/test/rowset/BaseRowSetTests.java
--- a/jdk/test/javax/sql/testng/test/rowset/BaseRowSetTests.java	Mon Dec 01 21:58:46 2014 +0300
+++ b/jdk/test/javax/sql/testng/test/rowset/BaseRowSetTests.java	Mon Dec 01 22:22:02 2014 +0300
@@ -186,11 +186,11 @@
     }
 
     /*
-     * Validate that getEscapeProcessing() returns false by default
+     * Validate that getEscapeProcessing() returns true by default
      */
     @Test
     public void test08() throws Exception {
-        assertFalse(brs.getEscapeProcessing());
+        assertTrue(brs.getEscapeProcessing());
     }
 
     /*