From 7f866a06ce57b1c1edb571ee8012be4f5c478054 Mon Sep 17 00:00:00 2001
From: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Date: Thu, 23 Feb 2017 14:53:19 +0200
Subject: [PATCH] Apply class renames mapping to white-listed bundles

---
 .../mgmt/classloading/JavaBrooklynClassLoadingContext.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
index 2a53e5b781..bd7c7daf58 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/classloading/JavaBrooklynClassLoadingContext.java
@@ -82,12 +82,13 @@ private ClassLoader getClassLoader() {
     @Override
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public Maybe<Class<?>> tryLoadClass(String className) {
-        Maybe<Class<?>> cls = tryLoadClass0(className);
+        String mappedClassName = DeserializingClassRenamesProvider.INSTANCE.findMappedName(className);
+        Maybe<Class<?>> cls = tryLoadClass0(mappedClassName);
         if (cls.isPresent()) {
             return cls;
         }
         try {
-            return (Maybe) Maybe.of(new ClassLoaderUtils(loader, mgmt).loadClass(className));
+            return (Maybe) Maybe.of(new ClassLoaderUtils(loader, mgmt).loadClass(mappedClassName));
         } catch (Exception e) {
             Exceptions.propagateIfFatal(e);
             // return original error
@@ -98,7 +99,6 @@ public Maybe<Class<?>> tryLoadClass(String className) {
     @SuppressWarnings({ "rawtypes", "unchecked" })
     private Maybe<Class<?>> tryLoadClass0(String className) {
         try {
-            className = DeserializingClassRenamesProvider.INSTANCE.findMappedName(className);
             return (Maybe) Maybe.of(getClassLoader().loadClass(className));
         } catch (NoClassDefFoundError e) {
             String msg = "Invalid linkage in (transitive dependencies of) class "+className+": "+e.toString();