Author: rwatler
Date: Mon Dec 21 05:54:28 2009
New Revision: 892698
URL: http://svn.apache.org/viewvc?rev=892698&view=rev
Log:
PageManager minor code improvments
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java?rev=892698&r1=892697&r2=892698&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java
Mon Dec 21 05:54:28 2009
@@ -130,7 +130,7 @@
{
// add new fragment or copy configuration
// from previously removed fragment
- if (removedFragment instanceof FragmentReferenceImpl)
+ if (removedFragment instanceof PageFragmentImpl)
{
// reuse previously removed fragment
reuseFragment = removedFragment;
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManager.java?rev=892698&r1=892697&r2=892698&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
Mon Dec 21 05:54:28 2009
@@ -1389,7 +1389,7 @@
// update fragments/page and mark cache transaction
fragmentsElement.setParent(parent);
- storeEntity( fragmentsElement, pageElementPath, true);
+ storeEntity(fragmentsElement, pageElementPath, true);
// new fragments/page
newFragmentsElement[0] = true;
@@ -1400,7 +1400,7 @@
fragmentsElement.checkAccess(JetspeedActions.EDIT);
// update fragments/page and mark cache transaction
- storeEntity( fragmentsElement, fragmentsElement.getPath(),
false);
+ storeEntity(fragmentsElement, fragmentsElement.getPath(),
false);
// updated fragments/page
newFragmentsElement[0] = false;
@@ -2598,7 +2598,7 @@
public void cleanupRequestCache()
{
// clear thread local cache on request completion
- rollbackTransactions();
+ fragmentPropertyListsCache.remove();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
