Repository: knox Updated Branches: refs/heads/master 5181adb5f -> 11a7fe7b0
KNOX-1612 - GatewayAdminTopologyFuncTest#testPutTopology ClassNotFoundException Signed-off-by: Kevin Risden <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/11a7fe7b Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/11a7fe7b Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/11a7fe7b Branch: refs/heads/master Commit: 11a7fe7b07def7c623dec3c5a320b9e84485cd30 Parents: 5181adb Author: Kevin Risden <[email protected]> Authored: Fri Nov 16 16:50:11 2018 -0500 Committer: Kevin Risden <[email protected]> Committed: Mon Nov 19 10:15:46 2018 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/knox/gateway/GatewayServer.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/11a7fe7b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java index 385f9cb..52ca3fd 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java @@ -696,7 +696,7 @@ public class GatewayServer { context.setTempDirectory( FileUtils.getFile( warFile, "META-INF", "temp" ) ); context.setErrorHandler( createErrorHandler() ); context.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", "false"); - + context.setClassLoader(this.getClass().getClassLoader()); return context; } @@ -793,16 +793,18 @@ public class GatewayServer { } contexts.addHandler( newContext ); if( contexts.isRunning() && !newContext.isRunning() ) { - newContext.start(); + newContext.start(); + if(!newContext.isAvailable()) { + throw newContext.getUnavailableException(); + } } - } catch( Exception e ) { + } catch( Throwable e ) { auditor.audit( Action.DEPLOY, topology.getName(), ResourceType.TOPOLOGY, ActionOutcome.FAILURE ); log.failedToDeployTopology( topology.getName(), e ); } } - private synchronized void internalDeactivateTopology( Topology topology ) { log.deactivatingTopology( topology.getName() );
