Mercurial > hg > release > icedtea7-forest-2.2 > jdk

changeset 5398:a0a8f7054efa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8011313: OCSP timeout set to wrong value if com.sun.security.ocsp.timeout not defined Reviewed-by: vinnie
author andrew
date Wed, 26 Jun 2013 22:30:32 -0500
parents b7372f646b8b
children 13df44d15f22
files src/share/classes/sun/security/provider/certpath/OCSP.java
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/provider/certpath/OCSP.java	Tue Apr 09 12:08:53 2013 +0400
+++ b/src/share/classes/sun/security/provider/certpath/OCSP.java	Wed Jun 26 22:30:32 2013 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2013, 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
@@ -81,10 +81,9 @@
      * value is negative, set the timeout length to the default.
      */
     private static int initializeTimeout() {
-        int tmp = java.security.AccessController.doPrivileged(
-                new GetIntegerAction("com.sun.security.ocsp.timeout",
-                                     DEFAULT_CONNECT_TIMEOUT));
-        if (tmp < 0) {
+        Integer tmp = java.security.AccessController.doPrivileged(
+                new GetIntegerAction("com.sun.security.ocsp.timeout"));
+        if (tmp == null || tmp < 0) {
             tmp = DEFAULT_CONNECT_TIMEOUT;
         }
         // Convert to milliseconds, as the system property will be