You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2011/06/07 13:06:35 UTC
svn commit: r1132956 - in
/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security:
tokenstore/SecurityToken.java wss4j/PolicyBasedWSS4JInInterceptor.java
wss4j/WSS4JInInterceptor.java
Author: coheigea
Date: Tue Jun 7 11:06:34 2011
New Revision: 1132956
URL: http://svn.apache.org/viewvc?rev=1132956&view=rev
Log:
Fixing some findbugs warnings.
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java?rev=1132956&r1=1132955&r2=1132956&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/SecurityToken.java Tue Jun 7 11:06:34 2011
@@ -463,7 +463,7 @@ public class SecurityToken {
private void createDefaultExpires() {
expires = new Date();
long currentTime = expires.getTime();
- expires.setTime(currentTime + 300 * 1000);
+ expires.setTime(currentTime + 300L * 1000L);
}
}
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1132956&r1=1132955&r2=1132956&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java Tue Jun 7 11:06:34 2011
@@ -130,11 +130,7 @@ public class PolicyBasedWSS4JInIntercept
url = ClassLoaderUtils.getResource((String)o, AbstractWSS4JInterceptor.class);
}
if (url == null) {
- try {
- url = new URL((String)o);
- } catch (Exception ex) {
- //ignore
- }
+ url = new URL((String)o);
}
if (url != null) {
properties = new Properties();
Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=1132956&r1=1132955&r2=1132956&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java (original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Tue Jun 7 11:06:34 2011
@@ -554,7 +554,7 @@ public class WSS4JInInterceptor extends
TokenStore store = (TokenStore)ep.getEndpointInfo()
.getProperty(TokenStore.class.getName());
if (store != null) {
- return new TokenStoreCallbackHandler(cbHandler, store);
+ return new TokenStoreCallbackHandler(null, store);
}
}
throw sec;
@@ -617,7 +617,7 @@ public class WSS4JInInterceptor extends
} else if (val instanceof Validator) {
config.setValidator(key, (Validator)val);
} else if (val == null) {
- config.setProcessor(key, (Class<?>)val);
+ config.setProcessor(key, (Class<?>)null);
}
}
final WSSecurityEngine ret = new WSSecurityEngine();