brett 2004/11/05 21:51:16
Modified: src/java/org/apache/maven/jelly/tags/werkz Tag:
MAVEN-1_0-BRANCH MavenAttainGoalTag.java
Log:
rollback previous change - it still causes a failure, need to find the cause instead
Revision Changes Path
No revision
No revision
1.2.2.10 +3 -10
maven/src/java/org/apache/maven/jelly/tags/werkz/MavenAttainGoalTag.java
Index: MavenAttainGoalTag.java
===================================================================
RCS file:
/home/cvs/maven/src/java/org/apache/maven/jelly/tags/werkz/MavenAttainGoalTag.java,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -u -r1.2.2.9 -r1.2.2.10
--- MavenAttainGoalTag.java 30 Oct 2004 11:30:28 -0000 1.2.2.9
+++ MavenAttainGoalTag.java 6 Nov 2004 05:51:16 -0000 1.2.2.10
@@ -81,17 +81,10 @@
not great to tie variables to session if we are creating a
new one */
Session session = ( Session ) getContext().getVariable(
PluginManager.GLOBAL_SESSION_KEY );
this.session = new JellySession( ( ( MavenJellyContext ) getContext()
).getXMLOutput() );
- if ( session != null )
+ for ( Iterator i = session.getAttributes().keySet().iterator();
i.hasNext();)
{
- for ( Iterator i = session.getAttributes().keySet().iterator();
i.hasNext();)
- {
- String key = ( String ) i.next();
- this.session.setAttribute( key, session.getAttribute( key ) );
- }
- }
- else
- {
- this.session.warn( "WARNING: session was created, but current
context did not contain the global session" );
+ String key = ( String ) i.next();
+ this.session.setAttribute( key, session.getAttribute( key ) );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
