From 03a7499322544d8c3e48cd3b0c23d864e545bee2 Mon Sep 17 00:00:00 2001
From: Sean Mullan <mullan@openjdk.org>
Date: Thu, 25 Apr 2013 11:18:29 -0400
Subject: [PATCH] 8011313: OCSP timeout set to wrong value if
com.sun.security.ocsp.timeout not defined
Reviewed-by: vinnie
---
.../classes/sun/security/provider/certpath/OCSP.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java b/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
index 03c910b8897..ca82ef598a0 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/OCSP.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2012, 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
@@ -85,10 +85,9 @@ public final class OCSP {
* 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) {
return DEFAULT_CONNECT_TIMEOUT;
}
// Convert to milliseconds, as the system property will be