brett 2004/11/04 05:35:10
Modified: src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
MavenUtils.java
Log:
PR: MAVEN-1404
stop erroneous classcastexception in log
Revision Changes Path
No revision
No revision
1.107.4.26 +17 -14 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.107.4.25
retrieving revision 1.107.4.26
diff -u -r1.107.4.25 -r1.107.4.26
--- MavenUtils.java 30 Oct 2004 11:14:13 -0000 1.107.4.25
+++ MavenUtils.java 4 Nov 2004 13:35:10 -0000 1.107.4.26
@@ -827,24 +827,27 @@
{
value = map.get( key );
- try
+ if ( value instanceof String )
{
- String literalValue = (String) value;
- Expression expr = CompositeExpression.parse( literalValue,
factory );
-
- if ( expr != null )
+ try
{
- value = expr;
+ String literalValue = (String) value;
+ Expression expr = CompositeExpression.parse( literalValue,
factory );
+
+ if ( expr != null )
+ {
+ value = expr;
+ }
+ else
+ {
+ value = literalValue;
+ }
}
- else
+ catch ( Exception e )
{
- value = literalValue;
+ // do nothing.
+ log.debug( "Unexpected error evaluating expression", e );
}
- }
- catch ( Exception e )
- {
- // do nothing.
- log.debug( "Unexpected error evaluating expression", e );
}
context.setVariable( key, value );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
