You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2006/11/01 03:48:07 UTC
svn commit: r469755 -
/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/util/RampartUtil.java
Author: ruchithf
Date: Tue Oct 31 18:48:06 2006
New Revision: 469755
URL: http://svn.apache.org/viewvc?view=rev&rev=469755
Log:
Preventing NPEs
Modified:
webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/util/RampartUtil.java
Modified: webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/util/RampartUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/util/RampartUtil.java?view=diff&rev=469755&r1=469754&r2=469755
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/util/RampartUtil.java (original)
+++ webservices/axis2/branches/java/1_1/modules/security/src/org/apache/rampart/util/RampartUtil.java Tue Oct 31 18:48:06 2006
@@ -90,13 +90,16 @@
* @throws RampartException
*/
public static CallbackHandler getPasswordCB(MessageContext msgContext, RampartPolicyData rpd) throws RampartException {
- ClassLoader classLoader = msgContext.getAxisService().getClassLoader();
- String cbHandlerClass = rpd.getRampartConfig().getPwCbClass();
-
- log.debug("loading class : " + cbHandlerClass);
CallbackHandler cbHandler;
- if (cbHandlerClass != null) {
+
+ if (rpd.getRampartConfig() != null && rpd.getRampartConfig().getPwCbClass() != null) {
+
+ String cbHandlerClass = rpd.getRampartConfig().getPwCbClass();
+ ClassLoader classLoader = msgContext.getAxisService().getClassLoader();
+
+ log.debug("loading class : " + cbHandlerClass);
+
Class cbClass;
try {
cbClass = Loader.loadClass(classLoader, cbHandlerClass);
@@ -176,8 +179,8 @@
throws RampartException {
log.debug("Loading encryption crypto");
- CryptoConfig cryptoConfig = config.getEncrCryptoConfig();
- if(cryptoConfig != null) {
+ if(config != null && config.getEncrCryptoConfig() != null) {
+ CryptoConfig cryptoConfig = config.getEncrCryptoConfig();
String provider = cryptoConfig.getProvider();
log.debug("Usig provider: " + provider);
Properties prop = cryptoConfig.getProp();
@@ -185,10 +188,10 @@
return CryptoFactory.getInstance(prop, loader);
} else {
log.debug("Trying the signature crypto info");
+
//Try using signature crypto infomation
- cryptoConfig = config.getSigCryptoConfig();
-
- if(cryptoConfig != null) {
+ if(config != null && config.getSigCryptoConfig() != null) {
+ CryptoConfig cryptoConfig = config.getSigCryptoConfig();
String provider = cryptoConfig.getProvider();
log.debug("Usig provider: " + provider);
Properties prop = cryptoConfig.getProp();
@@ -212,8 +215,8 @@
throws RampartException {
log.debug("Loading Signature crypto");
- CryptoConfig cryptoConfig = config.getSigCryptoConfig();
- if(cryptoConfig != null) {
+ if(config != null && config.getSigCryptoConfig() != null) {
+ CryptoConfig cryptoConfig = config.getSigCryptoConfig();
String provider = cryptoConfig.getProvider();
log.debug("Usig provider: " + provider);
Properties prop = cryptoConfig.getProp();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org