Author: dims
Date: Sat Aug 19 18:16:39 2006
New Revision: 432919
URL: http://svn.apache.org/viewvc?rev=432919&view=rev
Log:
if you can't find it in the class loader, then try the file system
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=432919&r1=432918&r2=432919&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
Sat Aug 19 18:16:39 2006
@@ -86,8 +86,14 @@
}
this.properties = properties;
String location =
this.properties.getProperty("org.apache.ws.security.crypto.merlin.file");
-
- InputStream is = Loader.getResource(loader, location).openStream();
+
+ InputStream is = null;
+ java.net.URL url = Loader.getResource(loader, location);
+ if(url != null) {
+ is = url.openStream();
+ } else {
+ is = new java.io.FileInputStream(location);
+ }
/**
* If we don't find it, then look on the file system.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
