Author: sgala
Date: Sun Aug 28 04:23:17 2005
New Revision: 263863
URL: http://svn.apache.org/viewcvs?rev=263863&view=rev
Log:
I managed to get a NPE out of here. Changing the comparison logic so that when
the comparison throws an Exceotion it returns false instead of propagating it
up.
Modified:
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
Modified:
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java?rev=263863&r1=263862&r2=263863&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
(original)
+++
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
Sun Aug 28 04:23:17 2005
@@ -791,7 +791,7 @@
}
// compare control and navigation locator properties
- if ((properties0 != null) && (properties1 != null))
+ try
{
for (int i = 0, limit = properties0.length; (i < limit); i++)
{
@@ -806,6 +806,9 @@
return false;
}
}
+ } catch(Throwable t) {
+ t.printStackTrace();
+ return false;
}
}
return true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
