coverity 1116759: possible null-pointer before indexOf-call move the if-block inside the next, guarded one

DaanHoogland · DaanHoogland · commit f15eaec254ef · 2015-07-17T13:12:26.000+02:00
Signed-off-by: Daan Hoogland <daan@onecht.net> This closes #600
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java b/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java
@@ -106,10 +106,10 @@ static Set<Class<?>> getClasses(ClassLoader loader, String packageName) {
             if (resources != null) {
                 while (resources.hasMoreElements()) {
                     String filePath = resources.nextElement().getFile();
-                    // WINDOWS HACK
-                    if (filePath.indexOf("%20") > 0)
-                        filePath = filePath.replaceAll("%20", " ");
                     if (filePath != null) {
+                        // WINDOWS HACK
+                        if (filePath.indexOf("%20") > 0)
+                            filePath = filePath.replaceAll("%20", " ");
                         if ((filePath.indexOf("!") > 0) && (filePath.indexOf(".jar") > 0)) {
                             String jarPath = filePath.substring(0, filePath.indexOf("!")).substring(filePath.indexOf(":") + 1);
                             // WINDOWS HACK
