Repository: ambari Updated Branches: refs/heads/branch-2.1 c8bfa4e8d -> a34b112f9
AMBARI-11774 - Views : NPE accessing view that includes velocity. (tbeerbower) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a34b112f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a34b112f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a34b112f Branch: refs/heads/branch-2.1 Commit: a34b112f966502c285e3ef7d721f1fd5c6106818 Parents: c8bfa4e Author: tbeerbower <[email protected]> Authored: Mon Jun 8 06:00:55 2015 -0400 Committer: tbeerbower <[email protected]> Committed: Mon Jun 8 10:07:45 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/ambari/server/view/ViewClassLoader.java | 1 + .../org/apache/ambari/server/view/ViewClassLoaderTest.java | 6 ++++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a34b112f/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java index c90bcaa..692f728 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java @@ -81,6 +81,7 @@ public class ViewClassLoader extends WebAppClassLoader { // add as system classes to avoid conflicts and linkage errors webAppContext.addSystemClass("org.slf4j."); webAppContext.addSystemClass("com.sun.jersey."); + webAppContext.addSystemClass("org.apache.velocity."); // set the class loader settings from the configuration if (viewConfig != null) { http://git-wip-us.apache.org/repos/asf/ambari/blob/a34b112f/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java index f831989..d2f0c8f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java @@ -80,6 +80,7 @@ public class ViewClassLoaderTest { expect(parentClassLoader.loadClass("com.google.inject.AbstractModule")).andReturn(parentClass).once(); expect(parentClassLoader.loadClass("org.slf4j.LoggerFactory")).andReturn(parentClass).once(); expect(parentClassLoader.loadClass("com.sun.jersey.api.ConflictException")).andReturn(parentClass).once(); + expect(parentClassLoader.loadClass("org.apache.velocity.VelocityContext")).andReturn(parentClass).once(); replay(parentClassLoader, viewConfig); @@ -126,6 +127,11 @@ public class ViewClassLoaderTest { Assert.assertNotNull(clazz); Assert.assertSame(parentClass, clazz); + clazz = classLoader.loadClass("org.apache.velocity.VelocityContext"); + + Assert.assertNotNull(clazz); + Assert.assertSame(parentClass, clazz); + verify(parentClassLoader, viewConfig); }
