*** catalina.sh.old	2016-02-24 18:03:55.407461000 +0000
--- catalina.sh	2016-02-24 18:04:24.871407100 +0000
***************
*** 127,146 ****
  # Copy CATALINA_BASE from CATALINA_HOME if not already set
  [ -z "$CATALINA_BASE" ] && CATALINA_BASE="$CATALINA_HOME"
  
- # Ensure that neither CATALINA_HOME nor CATALINA_BASE contains a colon
- # as this is used as the separator in the classpath and Java provides no
- # mechanism for escaping if the same character appears in the path.
- case $CATALINA_HOME in
-   *:*) echo "Using CATALINA_HOME:   $CATALINA_HOME";
-        echo "Unable to start as CATALINA_HOME contains a colon (:) character";
-        exit 1;
- esac
- case $CATALINA_BASE in
-   *:*) echo "Using CATALINA_BASE:   $CATALINA_BASE";
-        echo "Unable to start as CATALINA_BASE contains a colon (:) character";
-        exit 1;
- esac
- 
  # Ensure that any user defined CLASSPATH variables are not used on startup,
  # but allow them to be specified in setenv.sh, in rare case when it is needed.
  CLASSPATH=
--- 127,132 ----
***************
*** 160,165 ****
--- 146,165 ----
    [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
  fi
  
+ # Ensure that neither CATALINA_HOME nor CATALINA_BASE contains a colon
+ # as this is used as the separator in the classpath and Java provides no
+ # mechanism for escaping if the same character appears in the path.
+ case $CATALINA_HOME in
+   *:*) echo "Using CATALINA_HOME:   $CATALINA_HOME";
+        echo "Unable to start as CATALINA_HOME contains a colon (:) character";
+        exit 1;
+ esac
+ case $CATALINA_BASE in
+   *:*) echo "Using CATALINA_BASE:   $CATALINA_BASE";
+        echo "Unable to start as CATALINA_BASE contains a colon (:) character";
+        exit 1;
+ esac
+ 
  # For OS400
  if $os400; then
    # Set job priority to standard for interactive (interactive - 6) by using