Author: sohil.shah(a)jboss.com Date: 2007-09-06 18:07:41 -0400 (Thu, 06 Sep 2007) New Revision: 8194 Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java Log: JBPORTAL-1626,JBPORTAL-1669 - FIrst access to a CMS HTML file through /content/ results in a NPE, Make the JBossCachePersistenceManager compatible with JBoss Cache 1.4.1 Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2007-09-06 16:01:13 UTC (rev 8193) +++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2007-09-06 22:07:41 UTC (rev 8194) @@ -470,17 +470,8 @@ + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { - if (o instanceof WSPNode) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.WSP_NODE_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, - new Boolean(false)); - } + exists = true; + } } else if (this.schemaObjectPrefix .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) @@ -489,17 +480,8 @@ + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { - if (o instanceof VersionNode) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.VERSION_NODE_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, - new Boolean(false)); - } + exists = true; + } } return exists; } @@ -764,17 +746,8 @@ + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); if (o != null) { - if (o instanceof WSPProp) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.WSP_PROP_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(propId), propId, - new Boolean(false)); - } + exists = true; + } } else if (this.schemaObjectPrefix .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) @@ -783,17 +756,8 @@ + "/" + PortalCMSCacheLoader.parseNodeName(propId), propId); if (o != null) { - if (o instanceof VersionProp) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.VERSION_PROP_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(propId), propId, - new Boolean(false)); - } + exists = true; + } } return exists; } @@ -1088,17 +1052,8 @@ + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { - if (o instanceof WSPRefs) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.WSP_REF_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, - new Boolean(false)); - } + exists = true; + } } else if (this.schemaObjectPrefix .equalsIgnoreCase(HibernateStoreConstants.versionPrefix)) @@ -1107,17 +1062,8 @@ + "/" + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId); if (o != null) { - if (o instanceof VersionRefs) - { - exists = true; - } - } - else - { - this.pmCache.put(PortalCMSCacheLoader.VERSION_REF_NODE + "/" - + PortalCMSCacheLoader.parseNodeName(nodeId), nodeId, - new Boolean(false)); - } + exists = true; + } } return exists; }