X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.catalina%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fcatalina%2FTomcatDeployer.java;fp=server%2Fruntime%2Forg.argeo.server.catalina%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fcatalina%2FTomcatDeployer.java;h=3cc16bceee04cfe2eee7c4d7bfe3ff6ae59c33bd;hb=e1e76de107e054371fab6b517dcc5be621ebffc0;hp=2a5d0e9e87dfa348a15814b4b2657119dc5fc825;hpb=2c7ddfd144faa9ceace15c56996a2758dbd71089;p=lgpl%2Fargeo-commons.git

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 2a5d0e9e8..3cc16bcee 100644
--- 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;
+	}
+
+	
 }