Code cleanup

HotswapProjects · Mar 23, 2021 · ae419ff · ae419ff
1 parent 188e630
commit ae419ff
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/hotswap-agent-core/src/main/java/org/hotswap/agent/annotation/handler/WatchEventCommand.java b/hotswap-agent-core/src/main/java/org/hotswap/agent/annotation/handler/WatchEventCommand.java
@@ -19,6 +19,7 @@
 package org.hotswap.agent.annotation.handler;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
@@ -212,9 +213,12 @@ public void onWatchEvent(PluginAnnotation<T> pluginAnnotation, WatchFileEvent ev
      * @throws org.hotswap.agent.javassist.NotFoundException
      */
     private CtClass createCtClass(URI uri, ClassLoader classLoader) throws NotFoundException, IOException {
-        ClassPool cp = new ClassPool();
-        cp.appendClassPath(new LoaderClassPath(classLoader));
-
-        return cp.makeClass(new ByteArrayInputStream(IOUtils.toByteArray(uri)));
+        File file = new File(uri);
+        if (file.exists()) {
+          ClassPool cp = new ClassPool();
+          cp.appendClassPath(new LoaderClassPath(classLoader));
+          return cp.makeClass(new ByteArrayInputStream(IOUtils.toByteArray(uri)));
+        }
+        return null;
     }
 }
diff --git a/...gin/src/main/java/org/hotswap/agent/plugin/deltaspike/command/RepositoryRefreshAgent.java b/...gin/src/main/java/org/hotswap/agent/plugin/deltaspike/command/RepositoryRefreshAgent.java
@@ -85,7 +85,7 @@ public static void refreshHandler(ClassLoader appClassLoader, String repoClassNa
             LOGGER.info("Deltaspike repository {} refreshed.", repoClassName);
             RepositoryRefreshAgent.reloadFlag = true;
         } catch (ClassNotFoundException e) {
-            LOGGER.error("Repository class '{}' not found.", e, repoClassName);
+            LOGGER.error("Repository class '{}' not found.", repoClassName, e);
         } finally {
             Thread.currentThread().setContextClassLoader(oldContextClassLoader);
         }

diff --git a/...in/hotswap-agent-owb-plugin/src/test/java/org/hotswap/agent/plugin/owb/OwbPluginTest.java b/...in/hotswap-agent-owb-plugin/src/test/java/org/hotswap/agent/plugin/owb/OwbPluginTest.java
@@ -27,7 +27,6 @@
 import javax.enterprise.inject.spi.CDI;
 
 import org.hotswap.agent.plugin.hotswapper.HotSwapper;
-import org.hotswap.agent.plugin.owb.command.BeanClassRefreshAgent;
 import org.hotswap.agent.plugin.owb.command.BeanClassRefreshCommand;
 import org.hotswap.agent.plugin.owb.testBeans.DependentHello1;
 import org.hotswap.agent.plugin.owb.testBeans.HelloProducer1;