Done
diff --git a/appserver/tests/appserv-tests/devtests/deployment/config/common.xml b/appserver/tests/appserv-tests/devtests/deployment/config/common.xml
index 7360460..10983dd 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/config/common.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/config/common.xml
@@ -860,7 +860,7 @@
<antcall target="private-all">
<param name="build" value="${testsRoot}/build"/>
</antcall>
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}" failonerror="true">
<arg line="stop-domain"/>
</exec>
<antcall target="postTestsRun"/>
@@ -1131,7 +1131,7 @@
<antcall target="stopInstance"/>
<antcall target="stopCluster"/>
<echo message="Running... asadmin stop-domain"/>
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}">
<arg line="stop-domain ${testDomain}"/>
</exec>
</target>
@@ -1176,7 +1176,7 @@
<target name="unsetupDomain">
<echo message="Running... asadmin stop-domain"/>
- <exec executable="${ASADMIN}" failonerror="false">
+ <exec executable="${ASADMIN}">
<arg line="stop-domain ${testDomain}"/>
</exec>
<echo message="Running... asadmin delete-domain"/>
diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessUtils.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessUtils.java
index 8ba574e..524d6f0 100644
--- a/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessUtils.java
+++ b/nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessUtils.java
@@ -248,13 +248,6 @@
pm.execute();
System.out.println("ps -ef returned " + pm.getStdout());
-
- // Linux and BSD, not OS X
- pm = new ProcessManager("ls", "-l", "/proc/" + aPid + "/fd");
- pm.setEcho(false);
- pm.execute();
-
- System.out.println("ls -l /proc/" + aPid + "/fd returned " + pm.getStdout());
}