You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/04/17 01:45:32 UTC
svn commit: r1588102 - in /tomcat/trunk/java/org/apache:
catalina/core/AprLifecycleListener.java tomcat/jni/SSL.java
Author: markt
Date: Wed Apr 16 23:45:32 2014
New Revision: 1588102
URL: http://svn.apache.org/r1588102
Log:
Fix an Eclipse nag
Modified:
tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
Modified: tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1588102&r1=1588101&r2=1588102&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Wed Apr 16 23:45:32 2014
@@ -277,7 +277,12 @@ public class AprLifecycleListener
// In order to avoid the argument and check-value from getting out
// of sync for some reason, we are using the class constant
// FIPS_ON here.
- final int fipsModeState = SSL.fipsModeGet();
+ int fipsModeState;
+ try {
+ fipsModeState = SSL.fipsModeGet();
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
if(log.isDebugEnabled())
log.debug(sm.getString("aprListener.currentFIPSMode",
Modified: tomcat/trunk/java/org/apache/tomcat/jni/SSL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/SSL.java?rev=1588102&r1=1588101&r2=1588102&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/SSL.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/SSL.java Wed Apr 16 23:45:32 2014
@@ -235,7 +235,7 @@ public final class SSL {
* @return 0 If OpenSSL is not in FIPS mode, 1 if OpenSSL is in FIPS Mode.
* @throws Exception If tcnative was not compiled with FIPS Mode available.
*/
- public static native int fipsModeGet();
+ public static native int fipsModeGet() throws Exception;
/**
* Enable/Disable FIPS Mode.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org