Author: alitokmen
Date: 2009-08-12 07:14:10 -0500 (Wed, 12 Aug 2009)
New Revision: 1960
Modified:
core/trunk/containers/jonas/src/main/java/org/codehaus/cargo/container/jonas/Jonas5xInstalledLocalContainer.java
core/trunk/containers/jonas/src/main/java/org/codehaus/cargo/container/jonas/internal/Jonas4xAdminImpl.java
Log:
jonasAdmin ping may return -1
Modified: core/trunk/containers/jonas/src/main/java/org/codehaus/cargo/container/jonas/Jonas5xInstalledLocalContainer.java
===================================================================
--- core/trunk/containers/jonas/src/main/java/org/codehaus/cargo/container/jonas/Jonas5xInstalledLocalContainer.java 2009-07-21 14:07:46 UTC (rev 1959)
+++ core/trunk/containers/jonas/src/main/java/org/codehaus/cargo/container/jonas/Jonas5xInstalledLocalContainer.java 2009-08-12 12:14:10 UTC (rev 1960)
@@ -91,10 +91,10 @@
}
int returnCode = ping.executeJava();
- if (returnCode != 0 && returnCode != 1 && returnCode != 2)
+ if (returnCode != -1 && returnCode != 0 && returnCode != 1 && returnCode != 2)
{
throw new IllegalStateException("JonasAdmin ping returned " + returnCode
- + ", the only values allowed are 0, 1 and 2");
+ + ", the only values allowed are -1, 0, 1 and 2");
}
if (returnCode == 0)
{
Modified: core/trunk/containers/jonas/src/main/java/org/codehaus/cargo/container/jonas/internal/Jonas4xAdminImpl.java
===================================================================
--- core/trunk/containers/jonas/src/main/java/org/codehaus/cargo/container/jonas/internal/Jonas4xAdminImpl.java 2009-07-21 14:07:46 UTC (rev 1959)
+++ core/trunk/containers/jonas/src/main/java/org/codehaus/cargo/container/jonas/internal/Jonas4xAdminImpl.java 2009-08-12 12:14:10 UTC (rev 1960)
@@ -62,10 +62,10 @@
java.reconfigure();
int returnCode = java.executeJava();
- if (returnCode != 0 && returnCode != 1)
+ if (returnCode != -1 && returnCode != 0 && returnCode != 1)
{
throw new IllegalStateException("JonasAdmin ping returned " + returnCode
- + ", the only values allowed are 0 and 1");
+ + ", the only values allowed are -1, 0 and 1");
}
return returnCode == 0;
}
---------------------------------------------------------------------
To unsubscribe from this list, please visit:
http://xircles.codehaus.org/manage_email
