Revision: 1369
http://stripes.svn.sourceforge.net/stripes/?rev=1369&view=rev
Author: bengunter
Date: 2010-12-05 05:28:14 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
Applied partial fix for STS-788 from 1.5.x branch.
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/tag/layout/LayoutComponentTag.java
Modified:
trunk/stripes/src/net/sourceforge/stripes/tag/layout/LayoutComponentTag.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/tag/layout/LayoutComponentTag.java
2010-12-05 05:25:24 UTC (rev 1368)
+++
trunk/stripes/src/net/sourceforge/stripes/tag/layout/LayoutComponentTag.java
2010-12-05 05:28:14 UTC (rev 1369)
@@ -38,6 +38,7 @@
private String name;
private LayoutContext context;
private boolean silent;
+ private Boolean componentRenderPhase;
/** Gets the name of the component. */
public String getName() { return name; }
@@ -163,6 +164,8 @@
log.debug("Component was not present in ",
context.getRenderPage(),
" so using default content from ",
context.getDefinitionPage());
+ componentRenderPhase =
context.isComponentRenderPhase();
+ context.setComponentRenderPhase(true);
context.getOut().setSilent(false, pageContext);
return EVAL_BODY_INCLUDE;
}
@@ -209,6 +212,10 @@
if (isCurrentComponent())
context.setComponent(null);
+ // If the component render phase flag was changed, then restore it
now
+ if (componentRenderPhase != null)
+ context.setComponentRenderPhase(componentRenderPhase);
+
// Restore output's silent flag
context.getOut().setSilent(silent, pageContext);
@@ -217,6 +224,7 @@
finally {
this.context = null;
this.silent = false;
+ this.componentRenderPhase = null;
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
