portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdore...@apache.org
Subject svn commit: r577688 - /portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
Date Thu, 20 Sep 2007 11:18:40 GMT
Author: cdoremus
Date: Thu Sep 20 04:18:40 2007
New Revision: 577688

URL: http://svn.apache.org/viewvc?rev=577688&view=rev
Log:
Applied PortletConfig_090907.patch from PLUTO-420. Thanks, Torsten!

Modified:
    portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java?rev=577688&r1=577687&r2=577688&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
(original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletConfigImpl.java
Thu Sep 20 04:18:40 2007
@@ -137,7 +137,7 @@
 		if (portletDD.getPublicRenderParameter() != null){
 			return Collections.enumeration(portletDD.getPublicRenderParameter());
 		}
-		return null;
+		return  Collections.enumeration(new ArrayList<String>());
 	}
 
 	public String getDefaultNamespace() {
@@ -148,13 +148,13 @@
 		
 		return (portletDD.getProcessingEvents() != null) ? 
 				Collections.enumeration(portletDD.getProcessingEvents()) :
-					null;
+					Collections.enumeration(new ArrayList<QName>());
 	}
 
 	public Enumeration<QName> getPublishingEventQNames() {
 		return (portletDD.getPublishingEvents() != null) ?
 				Collections.enumeration(portletDD.getPublishingEvents()) :
-					null;
+					Collections.enumeration(new ArrayList<QName>());
 	}
 
 	public Enumeration<Locale> getSupportedLocales() {
@@ -162,8 +162,10 @@
 		// add an entry in the resut list (new Locale(string))
 		List<Locale> locals = new ArrayList<Locale>();
 		List<String> localsAsStrings = portletDD.getSupportedLocale();
-		for (String string : localsAsStrings) {
-			locals.add(new Locale(string));
+		if (localsAsStrings!=null){
+			for (String string : localsAsStrings) {
+				locals.add(new Locale(string));
+			}
 		}
 		return Collections.enumeration(locals);
 	}



Mime
View raw message