Extend Spring DM web extender in order to fix issue when undeploying

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.catalina / src / main / java / org / argeo / server / catalina / TomcatDeployer.java

diff --git a/server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/TomcatDeployer.java b/server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/TomcatDeployer.java
index 2a5d0e9e87dfa348a15814b4b2657119dc5fc825..3cc16bceee04cfe2eee7c4d7bfe3ff6ae59c33bd 100644 (file)
--- a/server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/TomcatDeployer.java
+++ b/server/runtime/org.argeo.server.catalina/src/main/java/org/argeo/server/catalina/TomcatDeployer.java
@@ -1,5 +1,26 @@
 package org.argeo.server.catalina;
 
-public class TomcatDeployer {
+import org.apache.catalina.Service;
+import org.springframework.osgi.web.deployer.tomcat.TomcatWarDeployer;
 
+/**
+ * Wraps the Spring DM Tomcate deployer in order to avoid issue with call to
+ * getServerInfo() when undeployed.
+ */
+public class TomcatDeployer extends TomcatWarDeployer {
+       private String serverInfo;
+
+       @Override
+       public void setService(Object service) {
+               super.setService(service);
+
+               serverInfo = ((Service) service).getInfo();
+       }
+
+       @Override
+       protected String getServerInfo() {
+               return serverInfo;
+       }
+
+       
 }