You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2015/01/27 09:01:52 UTC

[08/19] portals-pluto git commit: Fix bug in Mapper impl

Fix bug in Mapper impl


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/34295f10
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/34295f10
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/34295f10

Branch: refs/heads/PortletHub
Commit: 34295f10f6b320b2cff75ea34e813396abb6aecf
Parents: 79e249d
Author: Scott Nicklous <ms...@apache.org>
Authored: Tue Jan 20 22:46:15 2015 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Tue Jan 20 22:46:15 2015 +0100

----------------------------------------------------------------------
 .../portal/PublicRenderParameterMapperImpl.java | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/34295f10/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/PublicRenderParameterMapperImpl.java
----------------------------------------------------------------------
diff --git a/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/PublicRenderParameterMapperImpl.java b/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/PublicRenderParameterMapperImpl.java
index 7cd9a5f..8e328f2 100644
--- a/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/PublicRenderParameterMapperImpl.java
+++ b/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/PublicRenderParameterMapperImpl.java
@@ -143,6 +143,13 @@ public class PublicRenderParameterMapperImpl implements PublicRenderParameterMap
          }
       }
       if (isDebug) {
+         dbgstr.append("\nOn page " + paco.getName() + " there are " + prpList.size()
+               + " PRPs divided into " + qnList.size() + " groups with sizes: ");
+         String prefix = "";
+         for (List<PortalURLPublicParameter> lp : qn2PRP.values()) {
+            dbgstr.append(prefix + lp.size());
+            prefix = ", ";
+         }
          LOGGER.debug(dbgstr.toString());
       }
    }
@@ -150,15 +157,16 @@ public class PublicRenderParameterMapperImpl implements PublicRenderParameterMap
    
    public List<PortalURLPublicParameter> getPublicParameterGroup(int index) {
       List<PortalURLPublicParameter> oprps = new ArrayList<PortalURLPublicParameter>();
-      for (PortalURLPublicParameter prp : qn2PRP.get(qnList.get(index))) {
+      QName qn = qnList.get(index);
+      for (PortalURLPublicParameter prp : qn2PRP.get(qn)) {
          PortalURLPublicParameter p = prp.clone();
-         if (!prp.isRemoved()) {
-            p.setValues(prp.getValues().clone());
-            oprps.add(p);
-         }
+         String[] vals = (prp.getValues() == null) ? null : prp.getValues().clone();
+         p.setValues(vals);
+         oprps.add(p);
       }
       if (LOGGER.isDebugEnabled()) {
-         LOGGER.debug("getPublicParameterSet - Returning " + oprps.size() + " public render parameters");
+         LOGGER.debug("For index: " + index + ", QName = " + qn + ", group size = "
+                + oprps.size());
       }
       return oprps;
    }