Author: chris.laprun(a)jboss.com Date: 2011-09-01 15:37:05 -0400 (Thu, 01 Sep 2011) New Revision: 7285 Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java Log: - GTNPC-71: do not add invoker to cache if it has been resolved to null. Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java =================================================================== --- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2011-09-01 17:22:57 UTC (rev 7284) +++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2011-09-01 19:37:05 UTC (rev 7285) @@ -128,9 +128,12 @@ if (federatedPortletInvoker == null) { federatedPortletInvoker = nullHandler.resolvePortletInvokerFor(federatedId, this, compoundPortletId); - synchronized (this) + if (federatedPortletInvoker != null) { - invokerCache.put(federatedId, federatedPortletInvoker); // put newly resolved invoker in cache + synchronized (this) + { + invokerCache.put(federatedId, federatedPortletInvoker); // put newly resolved invoker in cache + } } } return federatedPortletInvoker;