From c3d040bc6cc13e437d21d5d40eb9df6df0f1f347 Mon Sep 17 00:00:00 2001
From: Tom De Wolf <1496448+tomdw@users.noreply.github.com>
Date: Mon, 16 Nov 2020 06:24:03 +0100
Subject: [PATCH] PAXWEB-1274 support jetty 9.4.34 (#293)

* PAXWEB-1274 only set classloader if jetty context has not started yet

* PAXWEB-1274 upgrade jetty from 9.4.31 to 9.4.34

Co-authored-by: Tom De Wolf <>
---
 .../service/jetty/internal/JettyServerImpl.java    | 14 +++++++-------
 pom.xml                                            |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pax-web-jetty/src/main/java/org/ops4j/pax/web/service/jetty/internal/JettyServerImpl.java b/pax-web-jetty/src/main/java/org/ops4j/pax/web/service/jetty/internal/JettyServerImpl.java
index 7e8d26db3b..68356f436e 100644
--- a/pax-web-jetty/src/main/java/org/ops4j/pax/web/service/jetty/internal/JettyServerImpl.java
+++ b/pax-web-jetty/src/main/java/org/ops4j/pax/web/service/jetty/internal/JettyServerImpl.java
@@ -316,14 +316,14 @@ public void start() throws Exception {
 					((org.eclipse.jetty.util.component.LifeCycle) server.getThreadPool()).start();
 				}
 
-				// Fixfor PAXWEB-725
-				ClassLoader classLoader = context.getClassLoader();
-				List<Bundle> bundles = ((ResourceDelegatingBundleClassLoader) classLoader).getBundles();
-				BundleClassLoader parentClassLoader
-						= new BundleClassLoader(bundle);
-				ResourceDelegatingBundleClassLoader containerSpecificClassLoader = new ResourceDelegatingBundleClassLoader(bundles, parentClassLoader);
-				context.setClassLoader(containerSpecificClassLoader);
 				if (!context.isStarted()) {
+					// Fixfor PAXWEB-725
+					ClassLoader classLoader = context.getClassLoader();
+					List<Bundle> bundles = ((ResourceDelegatingBundleClassLoader) classLoader).getBundles();
+					BundleClassLoader parentClassLoader
+							= new BundleClassLoader(bundle);
+					ResourceDelegatingBundleClassLoader containerSpecificClassLoader = new ResourceDelegatingBundleClassLoader(bundles, parentClassLoader);
+					context.setClassLoader(containerSpecificClassLoader);
 					context.start();
 				}
 
diff --git a/pom.xml b/pom.xml
index b5da7d8e95..c89aa68664 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
 		<dependency.jdt.groupId>org.eclipse.jdt.core.compiler</dependency.jdt.groupId>
 		<dependency.jdt.artifactId>ecj</dependency.jdt.artifactId>
 		<dependency.jdt.version>4.5.1</dependency.jdt.version>
-		<dependency.jetty.version>9.4.31.v20200723</dependency.jetty.version>
+		<dependency.jetty.version>9.4.34.v20201102</dependency.jetty.version>
 		<dependency.jsr303.version>1.8.0</dependency.jsr303.version>
 		<dependency.jsr305.version>1.3.9_1</dependency.jsr305.version>
 		<dependency.jstl.version>1.2</dependency.jstl.version>