You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/02/21 13:32:43 UTC
svn commit: r1448624 - in
/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin:
Synchronization.java UpdatableTomEEMojo.java
Author: rmannibucau
Date: Thu Feb 21 12:32:43 2013
New Revision: 1448624
URL: http://svn.apache.org/r1448624
Log:
avoiding NPE + explicit log message when the reload will not work
Modified:
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synchronization.java
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synchronization.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synchronization.java?rev=1448624&r1=1448623&r2=1448624&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synchronization.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/Synchronization.java Thu Feb 21 12:32:43 2013
@@ -17,6 +17,7 @@
package org.apache.openejb.maven.plugin;
import java.io.File;
+import java.util.ArrayList;
import java.util.List;
public class Synchronization {
@@ -70,6 +71,9 @@ public class Synchronization {
}
public List<String> getExtensions() {
+ if (extensions == null) {
+ extensions = new ArrayList<String>();
+ }
return extensions;
}
@@ -86,6 +90,9 @@ public class Synchronization {
}
public List<String> getUpdateOnlyExtenions() {
+ if (updateOnlyExtensions == null) {
+ updateOnlyExtensions = new ArrayList<String>();
+ }
return updateOnlyExtensions;
}
Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java?rev=1448624&r1=1448623&r2=1448624&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java Thu Feb 21 12:32:43 2013
@@ -148,7 +148,7 @@ public abstract class UpdatableTomEEMojo
}
}
- // serialazing synchronizers to avoid multiple updates at the same time and reload a single time the app
+ // serializing synchronizers to avoid multiple updates at the same time and reload a single time the app
if (!synchronizers.isEmpty()) {
task = new SynchronizerRedeployer(synchronizers);
getLog().info("Starting synchronizer with an update interval of " + interval);
@@ -182,12 +182,17 @@ public abstract class UpdatableTomEEMojo
}
protected synchronized void reload() {
- String path = deployedFile.getAbsolutePath();
- if (path.endsWith(".war") || path.endsWith(".ear")) {
- path = path.substring(0, path.length() - ".war".length());
+ if (deployOpenEjbApplication) {
+ String path = deployedFile.getAbsolutePath();
+ if (path.endsWith(".war") || path.endsWith(".ear")) {
+ path = path.substring(0, path.length() - ".war".length());
+ }
+ getLog().info("Reloading " + path);
+ deployer().reload(path);
+ } else {
+ getLog().warn("Reload command needs to activate openejb internal application. " +
+ "Add <deployOpenEjbApplication>true</deployOpenEjbApplication> to the plugin configuration to force it.");
}
- getLog().info("Reloading " + path);
- deployer().reload(path);
}
private class SynchronizerRedeployer extends TimerTask {