taylor 2004/07/07 20:48:05
Modified: fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager
FusionAppServerPAM.java
Log:
fixed npe in deployment
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.2 +6 -1
jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionAppServerPAM.java
Index: FusionAppServerPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/fusion/src/java/org/apache/jetspeed/fusion/tools/pamanager/FusionAppServerPAM.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FusionAppServerPAM.java 2 Jul 2004 14:45:31 -0000 1.1
+++ FusionAppServerPAM.java 8 Jul 2004 03:48:05 -0000 1.2
@@ -54,6 +54,7 @@
{
super(webAppsDir, registry, fsManager, entityAccess, windowAccess);
ArgUtil.assertNotNull(ApplicationServerManager.class, appServerManager,
this);
+ this.appServerManager = appServerManager;
}
/**
@@ -252,6 +253,10 @@
private boolean isServerAvailable()
{
+ if (null == appServerManager)
+ {
+ return false;
+ }
return appServerManager.isConnected();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
