Index: /src/java/org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controllers/VelocityPanedPortletController.java,v
retrieving revision 1.8
diff -u -r1.8 VelocityPanedPortletController.java
--- VelocityPanedPortletController.java	4 Mar 2003 00:05:03 -0000	1.8
+++ VelocityPanedPortletController.java	6 May 2003 03:18:01 -0000
@@ -199,7 +199,7 @@
         {
             Log.error( e );
         }
-        DynamicURI uri = jsLink.setPaneById(portlet.getID());
+        DynamicURI uri = jsLink.getPaneById(portlet.getID());
         JetspeedLinkFactory.putInstance(jsLink);
         
         return uri;
@@ -225,18 +225,16 @@
             // the parameter is undefined, search for sticky value in session
             String id = getPortlets().getID(); 
             pane = retrievePaneIDFromSession(rundata);
-            if (pane == null)
-            {
-                // use default
-                pane = getPortlets().getPortletAt(0).getID();
-
-            }
         }
-        int index = pane.indexOf(JetspeedResources.PATH_SUBPANE_SEPARATOR);
-        if (index > -1)
+        
+        if(pane != null)
         {
-            //return pane.substring(index + 1);
-            return pane.substring(0, index);
+            int index = pane.indexOf(JetspeedResources.PATH_SUBPANE_SEPARATOR);
+            if (index > -1)
+            {
+                //return pane.substring(index + 1);
+                return pane.substring(0, index);
+            }
         }
         
         return pane;
@@ -261,7 +259,10 @@
         if (pane == null)
         {
             // use default
-            pane = getPortlets().getPortletAt(0).getID();
+            if(getPortlets().size() > 0)
+            {
+	            pane = getPortlets().getPortletAt(0).getID();
+            }
         }
        
         return pane;