[SCM] tomcat7: Servlet and JSP engine branch, exp/master, updated. debian/7.0.34-1_exp1-8-g8429fcf

[tony mancill]

The following commit has been merged in the exp/master branch:
commit 4a01371e08fb536b876fa495bb21928429cc61a5
Author: tony mancill <tmancill at debian.org>
Date:   Mon Feb 4 21:11:31 2013 -0800

    add patch for upstream JSP compilation bug

diff --git a/debian/patches/0016_upstream_bug_54440.patch b/debian/patches/0016_upstream_bug_54440.patch
new file mode 100644
index 0000000..1d4e4d3
--- /dev/null
+++ b/debian/patches/0016_upstream_bug_54440.patch
@@ -0,0 +1,44 @@
+Description: upstream patch from upcoming 7.0.36 to allow precompilation 
+ of JSPs; TagPluginManager.init() throws NPE when used in Ant <jasper> task
+Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=54440
+Origin: https://issues.apache.org/bugzilla/attachment.cgi?id=29860
+Forwarded: not-needed
+
+--- a/java/org/apache/jasper/JspC.java
++++ b/java/org/apache/jasper/JspC.java
+@@ -1516,7 +1516,7 @@
+         URL urlsA[]=new URL[urls.size()];
+         urls.toArray(urlsA);
+         loader = new URLClassLoader(urlsA, this.getClass().getClassLoader());
+-
++        context.setClassLoader(loader);
+     }
+ 
+     /**
+--- a/java/org/apache/jasper/servlet/JspCServletContext.java
++++ b/java/org/apache/jasper/servlet/JspCServletContext.java
+@@ -77,6 +77,11 @@
+      */
+     protected URL myResourceBaseURL;
+ 
++
++    /**
++     * Class Loader
++     */
++    private ClassLoader loader;
+ 
+     // ----------------------------------------------------------- Constructors
+ 
+@@ -612,7 +617,11 @@
+ 
+     @Override
+     public ClassLoader getClassLoader() {
+-        return null;
++        return loader;
++    }
++
++    public void setClassLoader(ClassLoader loader) {
++    	this.loader = loader;
+     }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 22701ba..5817396 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0013-dont-look-for-build-properties-in-user-home.patch
 0014-JDTCompiler.patch
 0015_disable_test_TestCometProcessor.patch
+0016_upstream_bug_54440.patch

-- 
tomcat7: Servlet and JSP engine