So much for manually fixing a merge conflict because it was a one-liner... fixed again now ...
Den 11. okt. 2012 kl. 20:23 skrev Robert Scholte <[email protected]>: > Still looks wrong to me, I'd expect it to be: > > envVars.put( !caseSensitive ? entry.getKey().toUpperCase( Locale.ENGLISH ) : > entry.getKey(), entry.getValue() ); > > > Op Thu, 11 Oct 2012 20:04:31 +0200 schreef <[email protected]>: > >> Author: krosenvold >> Date: Thu Oct 11 18:04:30 2012 >> New Revision: 1397203 >> >> URL: http://svn.apache.org/viewvc?rev=1397203&view=rev >> Log: >> o Fixed test break >> >> Modified: >> >> maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java >> >> Modified: >> maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java >> URL: >> http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java?rev=1397203&r1=1397202&r2=1397203&view=diff >> ============================================================================== >> --- >> maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java >> (original) >> +++ >> maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java >> Thu Oct 11 18:04:30 2012 >> @@ -550,7 +550,7 @@ public abstract class CommandLineUtils >> @SuppressWarnings( { "unchecked" } ) Map<String, String> envs = >> (Map<String, String>) method.invoke( null ); >> for ( Map.Entry<String, String> entry : envs.entrySet() ) >> { >> - envVars.put( !caseSensitive ? entry.getKey().toUpperCase( >> Locale.ENGLISH ) : entry, entry.getValue() ); >> + envVars.put( !caseSensitive ? entry.getKey().toUpperCase( >> Locale.ENGLISH ) : entry.getValue(), entry.getValue() ); >> } >> return envVars; >> } > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
