Author: violetagg
Date: Wed Nov 4 08:17:10 2015
New Revision: 1712489
URL: http://svn.apache.org/viewvc?rev=1712489&view=rev
Log:
Fixed UnsupportedOperationException when releasing an user-provided
URLStreamHandlerFactory. Patch provided by Cristian Talau via github.
Added:
tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java?rev=1712489&r1=1712488&r2=1712489&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
Wed Nov 4 08:17:10 2015
@@ -102,10 +102,11 @@ public class TomcatURLStreamHandlerFacto
public static void release(ClassLoader classLoader) {
Iterator<URLStreamHandlerFactory> iter =
instance.userFactories.iterator();
while (iter.hasNext()) {
- ClassLoader factoryLoader =
iter.next().getClass().getClassLoader();
+ URLStreamHandlerFactory candidate = iter.next();
+ ClassLoader factoryLoader = candidate.getClass().getClassLoader();
while (factoryLoader != null) {
if (classLoader.equals(factoryLoader)) {
- iter.remove();
+ instance.userFactories.remove(candidate);
break;
}
factoryLoader = factoryLoader.getParent();
Added:
tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java?rev=1712489&view=auto
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
(added)
+++
tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
Wed Nov 4 08:17:10 2015
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.webresources;
+
+import java.net.URLStreamHandler;
+import java.net.URLStreamHandlerFactory;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestTomcatURLStreamHandlerFactory {
+
+ @Before
+ public void register() {
+ TomcatURLStreamHandlerFactory.register();
+ }
+
+ @Test
+ public void testUserFactory() throws Exception {
+ URLStreamHandlerFactory factory = new URLStreamHandlerFactory() {
+ @Override
+ public URLStreamHandler createURLStreamHandler(String protocol) {
+ return null;
+ }
+ };
+ TomcatURLStreamHandlerFactory.getInstance().addUserFactory(factory);
+
TomcatURLStreamHandlerFactory.release(factory.getClass().getClassLoader());
+ }
+}
\ No newline at end of file
Propchange:
tomcat/trunk/test/org/apache/catalina/webresources/TestTomcatURLStreamHandlerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
