db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r1071405 - in /db/derby/code/branches/10.5/bin: setNetworkClientCP setNetworkServerCP
Date Wed, 16 Feb 2011 21:29:42 GMT
Author: mikem
Date: Wed Feb 16 21:29:42 2011
New Revision: 1071405

URL: http://svn.apache.org/viewvc?rev=1071405&view=rev
Log:
DERBY-4500 setNetworkClientCP should use return, not exit, on error

backported change #895666 from trunk to 10.5 branch.

Since the setNetworkClientCP and setNetworkServerCP scripts are designed
to be called from another script, or sourced from the shell, they should
use 'return' rather than 'exit', to report an error.

This change was contributed by John Storta, Jr. (js at storta dot net).


Modified:
    db/derby/code/branches/10.5/bin/setNetworkClientCP
    db/derby/code/branches/10.5/bin/setNetworkServerCP

Modified: db/derby/code/branches/10.5/bin/setNetworkClientCP
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/bin/setNetworkClientCP?rev=1071405&r1=1071404&r2=1071405&view=diff
==============================================================================
--- db/derby/code/branches/10.5/bin/setNetworkClientCP (original)
+++ db/derby/code/branches/10.5/bin/setNetworkClientCP Wed Feb 16 21:29:42 2011
@@ -20,7 +20,7 @@
 if [ -z "$DERBY_HOME" ] ; then
   echo "Error: DERBY_HOME is not set. Please set the DERBY_HOME environment variable"
   echo "to the location of your Derby installation."
-  exit 1
+  return 1
 fi
 
 export CLASSPATH="${DERBY_HOME}/lib/derbyclient.jar:${DERBY_HOME}/lib/derbytools.jar:${CLASSPATH}"

Modified: db/derby/code/branches/10.5/bin/setNetworkServerCP
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/bin/setNetworkServerCP?rev=1071405&r1=1071404&r2=1071405&view=diff
==============================================================================
--- db/derby/code/branches/10.5/bin/setNetworkServerCP (original)
+++ db/derby/code/branches/10.5/bin/setNetworkServerCP Wed Feb 16 21:29:42 2011
@@ -20,7 +20,7 @@
 if [ -z "$DERBY_HOME" ]; then
   echo "Error: DERBY_HOME is not set. Please set the DERBY_HOME environment variable"
   echo "to the location of your Derby installation."
-  exit 1
+  return 1
 fi
 
 export CLASSPATH="${DERBY_HOME}/lib/derbynet.jar:${DERBY_HOME}/lib/derbytools.jar:${CLASSPATH}"



Mime
View raw message