Author: rwatler
Date: Thu Dec 22 18:41:52 2005
New Revision: 358687
URL: http://svn.apache.org/viewcvs?rev=358687&view=rev
Log:
correct decorator undeployment path checking
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java
Modified:
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java?rev=358687&r1=358686&r2=358687&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java
(original)
+++
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java
Thu Dec 22 18:41:52 2005
@@ -195,9 +195,9 @@
public void invokeUndeploy(File deployPathFile) throws DeploymentException
{
- if (deployPathFile == null || !deployPathFile.exists() ||
!deployPathFile.isDirectory()
- || deployPathFile.getParentFile() == null ||
deployPathFile.getParentFile().getParentFile() == null
- ||
!deployToDir.equals(deployPathFile.getParentFile().getParentFile().getParent()))
+ if (deployPathFile == null || !deployPathFile.exists() ||
+ !deployPathFile.isDirectory() || deployPathFile.getParentFile() ==
null ||
+ !deployToDir.equals(deployPathFile.getParentFile().getParent()))
{
throw new DeploymentException("Cannot undeploy decorator at " +
deployPathFile + ": invalid decorator path");
}
@@ -305,7 +305,7 @@
{
layoutType = "generic";
}
- return deployToDir + File.separator + layoutType ;
+ return deployToDir + File.separator + layoutType ;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
