changeset 6767:10cd25a8c020

Merge
author asaha
date Tue, 21 May 2013 12:05:38 -0700
parents 2790e9ace697 39282f162343
children 65b07e0a2f36
files test/java/util/logging/bundlesearch/LoadItUp1.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/provider/certpath/OCSP.java	Tue May 21 19:04:50 2013 +0400
+++ b/src/share/classes/sun/security/provider/certpath/OCSP.java	Tue May 21 12:05:38 2013 -0700
@@ -83,7 +83,7 @@
         Integer tmp = java.security.AccessController.doPrivileged(
                 new GetIntegerAction("com.sun.security.ocsp.timeout"));
         if (tmp == null || tmp < 0) {
-            tmp = DEFAULT_CONNECT_TIMEOUT;
+            return DEFAULT_CONNECT_TIMEOUT;
         }
         // Convert to milliseconds, as the system property will be
         // specified in seconds