Fix additional file scanning issue that increases the server startup …

…time

modules/distribution/product/src/main/startup-scripts/api-manager.bat

@@ -63,9 +63,19 @@ rem ----- update classpath -----------------------------------------------------
 :updateClasspath
 cd %CARBON_HOME%
 set CARBON_CLASSPATH=
-FOR %%C in ("%CARBON_HOME%\bin\*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\bin\%%~nC%%~xC"
+FOR %%C in ("%CARBON_HOME%\bin\*.jar") DO (
+	if "!CARBON_CLASSPATH!"=="" (
+		set CARBON_CLASSPATH=".\bin\%%~nC%%~xC"
+    ) else (
+        set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\bin\%%~nC%%~xC"
+    )
+)
 
-set CARBON_CLASSPATH="%JAVA_HOME%\lib\tools.jar";%CARBON_CLASSPATH%;
+if "!CARBON_CLASSPATH!"=="" (
+	set CARBON_CLASSPATH="%JAVA_HOME%\lib\tools.jar"
+) else (
+	set CARBON_CLASSPATH="%JAVA_HOME%\lib\tools.jar";%CARBON_CLASSPATH%
+)
 
 FOR %%D in ("%CARBON_HOME%\lib\commons-lang*.jar") DO set CARBON_CLASSPATH=!CARBON_CLASSPATH!;".\lib\%%~nD%%~xD"
 

modules/distribution/product/src/main/startup-scripts/api-manager.sh

@@ -256,16 +256,28 @@ fi
 for f in "$CARBON_HOME"/bin/*.jar
 do
     if [ "$f" != "$CARBON_HOME/bin/*.jar" ];then
-        CARBON_CLASSPATH="$CARBON_CLASSPATH":$f
+        if [ -n "$CARBON_CLASSPATH" ]; then
+            CARBON_CLASSPATH="$CARBON_CLASSPATH:$f"
+        else
+            CARBON_CLASSPATH="$f"
+        fi
     fi
 done
 for t in "$CARBON_HOME"/lib/*.jar
 do
-    CARBON_CLASSPATH="$CARBON_CLASSPATH":$t
+    if [ -n "$CARBON_CLASSPATH" ]; then
+        CARBON_CLASSPATH="$CARBON_CLASSPATH:$t"
+    else
+        CARBON_CLASSPATH="$t"
+    fi
 done
 for t in "$CARBON_HOME"/lib/endorsed/*.jar
 do
-    CARBON_CLASSPATH="$CARBON_CLASSPATH":$t
+    if [ -n "$CARBON_CLASSPATH" ]; then
+        CARBON_CLASSPATH="$CARBON_CLASSPATH:$t"
+    else
+        CARBON_CLASSPATH="$t"
+    fi
 done