svn commit: r900540 - in /maven/maven-3/trunk/maven-core/src: main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java test/java/org/apache/maven/execution/DefaultMavenExecutionTestCase.java

[be...@apache.org]

Author: bentmann
Date: Mon Jan 18 20:39:42 2010
New Revision: 900540

URL: http://svn.apache.org/viewvc?rev=900540&view=rev
Log:
o Fixed NPE

Added:
    maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTestCase.java   (with props)
Modified:
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=900540&r1=900539&r2=900540&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java Mon Jan 18 20:39:42 2010
@@ -154,7 +154,7 @@
         copy.setUserSettingsFile( original.getUserSettingsFile() );
         copy.setGlobalSettingsFile( original.getGlobalSettingsFile() );
         copy.setUserToolchainsFile( original.getUserToolchainsFile() );
-        copy.setBaseDirectory( new File( original.getBaseDirectory() ) );
+        copy.setBaseDirectory( ( original.getBaseDirectory() != null ) ? new File( original.getBaseDirectory() ) : null );
         copy.setGoals( original.getGoals() );
         copy.setRecursive( original.isRecursive() );
         copy.setPom( original.getPom() );

Added: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTestCase.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTestCase.java?rev=900540&view=auto
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTestCase.java (added)
+++ maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTestCase.java Mon Jan 18 20:39:42 2010
@@ -0,0 +1,36 @@
+package org.apache.maven.execution;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.TestCase;
+
+/**
+ * @author Benjamin Bentmann
+ */
+public class DefaultMavenExecutionTestCase
+    extends TestCase
+{
+
+    public void testCopyDefault()
+    {
+        assertNotNull( DefaultMavenExecutionRequest.copy( new DefaultMavenExecutionRequest() ) );
+    }
+
+}

Propchange: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-3/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTestCase.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision