Author: nandana
Date: Wed Jun 11 02:45:16 2008
New Revision: 666594
URL: http://svn.apache.org/viewvc?rev=666594&view=rev
Log:
WSS-102 This fix was included in 1.5.4 branch and seems to be not merged to the
trunk
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
Modified:
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java?rev=666594&r1=666593&r2=666594&view=diff
==============================================================================
---
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
(original)
+++
webservices/wss4j/trunk/src/org/apache/ws/security/components/crypto/AbstractCrypto.java
Wed Jun 11 02:45:16 2008
@@ -58,6 +58,9 @@
*/
public AbstractCrypto(Properties properties, ClassLoader loader) throws
CredentialException, IOException {
this.properties = properties;
+ if (this.properties == null) {
+ return;
+ }
String location =
this.properties.getProperty("org.apache.ws.security.crypto.merlin.file");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
