You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/09/24 17:44:24 UTC
[4/8] git commit: KNOX-152 - Dynamic redeploy of topo causes
subsequent requests to fail
KNOX-152 - Dynamic redeploy of topo causes subsequent requests to fail
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/209d23bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/209d23bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/209d23bc
Branch: refs/heads/master
Commit: 209d23bcd977a68c6518cdcd26d8a544e83fb4e1
Parents: 7756104
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Tue Sep 24 11:43:43 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Tue Sep 24 11:44:16 2013 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/gateway/GatewayServer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/209d23bc/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
index 827ab88..e2f4f36 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/GatewayServer.java
@@ -302,7 +302,7 @@ public class GatewayServer {
context.setDefaultsDescriptor( null );
context.setContextPath( "/" + config.getGatewayPath() + "/" + name );
context.setWar( warPath );
- internalUndeploy( topology );
+ // internalUndeploy( topology ); KNOX-152
context.setAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE, name );
deployments.put( name, context );
contexts.addHandler( context );
@@ -352,6 +352,7 @@ public class GatewayServer {
try {
if( !warDir.exists() ) {
log.deployingTopology( topology.getName(), warDir.getAbsolutePath() );
+ internalUndeploy( topology ); // KNOX-152
WebArchive war = null;
war = DeploymentFactory.createDeployment( config, topology );
File tmp = war.as( ExplodedExporter.class ).exportExploded( topoDir, warDir.getName() + ".tmp" );