You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2007/03/02 03:50:28 UTC
svn commit: r513603 - in /portals/jetspeed-2/trunk:
applications/gems/src/java/org/apache/portals/gems/util/
components/portal/src/java/org/apache/jetspeed/aggregator/impl/
jetspeed-api/src/java/org/apache/jetspeed/aggregator/
Author: taylor
Date: Thu Mar 1 18:50:27 2007
New Revision: 513603
URL: http://svn.apache.org/viewvc?view=rev&rev=513603
Log:
bug fix: don't cache content that fails to render, since it can come online
Modified:
portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/PortletContentImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletContentImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletContent.java
Modified: portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/PortletContentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/PortletContentImpl.java?view=diff&rev=513603&r1=513602&r2=513603
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/PortletContentImpl.java (original)
+++ portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/PortletContentImpl.java Thu Mar 1 18:50:27 2007
@@ -87,6 +87,12 @@
return complete;
}
+ // error case, don't notify
+ public void completeWithError()
+ {
+ setComplete(true);
+ }
+
void setComplete( boolean state )
{
this.complete = state;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletContentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletContentImpl.java?view=diff&rev=513603&r1=513602&r2=513603
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletContentImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletContentImpl.java Thu Mar 1 18:50:27 2007
@@ -90,9 +90,9 @@
return complete;
}
- void setComplete( boolean state )
+ void setComplete(boolean state, boolean notify)
{
- if (renderer != null)
+ if (renderer != null && notify)
renderer.notifyContentComplete(this);
this.complete = state;
}
@@ -111,7 +111,13 @@
*/
public void complete()
{
- setComplete(true);
+ setComplete(true, true);
+ }
+
+ // error case, don't notify
+ public void completeWithError()
+ {
+ setComplete(true, false);
}
public String getCacheKey()
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java?view=diff&rev=513603&r1=513602&r2=513603
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java Thu Mar 1 18:50:27 2007
@@ -196,6 +196,7 @@
long start = System.currentTimeMillis();
boolean isParallelMode = false;
PortletWindow curWindow = null;
+ boolean failedRender = false;
try
{
@@ -258,8 +259,11 @@
{
long end = System.currentTimeMillis();
boolean exceededTimeout = portletTracking.exceededTimeout(end - start, window);
- portletContent.complete();
-
+ if (fragment.getOverriddenContent() != null)
+ portletContent.completeWithError();
+ else
+ portletContent.complete();
+
if (isParallelMode)
{
this.renderer.addTitleToHeader(curWindow, fragment,
Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletContent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletContent.java?view=diff&rev=513603&r1=513602&r2=513603
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletContent.java (original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/PortletContent.java Thu Mar 1 18:50:27 2007
@@ -43,6 +43,12 @@
void complete();
/**
+ * Notify that this content is complete with error
+ *
+ */
+ void completeWithError();
+
+ /**
* Get a writer to the content to stream content into this object
* @return
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org