fix for bug 2471: accept null as boat class name and using default values for the boat class in this case

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BoatClassMasterdata.java

@@ -89,12 +89,10 @@ public enum BoatClassMasterdata {
 
     public static BoatClassMasterdata resolveBoatClass(String boatClassName) {
         String boatClassNameToResolve = unifyBoatClassName(boatClassName);
-        
         for (BoatClassMasterdata boatClass : values()) {
             if (unifyBoatClassName(boatClass.displayName).equals(boatClassNameToResolve)) {
                 return boatClass;
-            }
-            if(boatClass.alternativeNames != null) {
+            } else if (boatClass.alternativeNames != null) {
                 for (String name : boatClass.alternativeNames) {
                     if (unifyBoatClassName(name).equals(boatClassNameToResolve)) {
                         return boatClass;

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/SharedDomainFactoryImpl.java

@@ -272,9 +272,9 @@ public class SharedDomainFactoryImpl implements SharedDomainFactory {
     public BoatClass getOrCreateBoatClass(String name, boolean typicallyStartsUpwind) {
         synchronized (boatClassCache) {
             BoatClass result = boatClassCache.get(name);
-            if(result == null) {
+            if (result == null && name != null) {
                 BoatClassMasterdata boatClassMasterdata = BoatClassMasterdata.resolveBoatClass(name);
-                if(boatClassMasterdata != null) {
+                if (boatClassMasterdata != null) {
                     result = new BoatClassImpl(name, boatClassMasterdata);
                     boatClassCache.put(name, result);
                 }
@@ -289,7 +289,7 @@ public class SharedDomainFactoryImpl implements SharedDomainFactory {
     
     @Override
     public BoatClass getOrCreateBoatClass(String name) {
-        return getOrCreateBoatClass(name, /* typicallyStartsUpwind */!mayStartWithNoUpwindLeg.contains(name.toLowerCase()));
+        return getOrCreateBoatClass(name, name == null || /* typicallyStartsUpwind */!mayStartWithNoUpwindLeg.contains(name.toLowerCase()));
     }
     
     @Override

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/BoatClassWithNullNameTest.java

@@ -0,0 +1,25 @@
+package com.sap.sailing.domain.common;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
+import org.junit.Test;
+
+import com.sap.sailing.domain.base.BoatClass;
+import com.sap.sailing.domain.base.DomainFactory;
+
+public class BoatClassWithNullNameTest {
+    /**
+     * See bug 2471
+     */
+    @Test
+    public void testCreatingBoatClassWithNullName() {
+        DomainFactory domainFactory = DomainFactory.INSTANCE;
+        BoatClass boatClass = domainFactory.getOrCreateBoatClass(null);
+        assertNotNull(boatClass);
+        assertNull(boatClass.getName());
+        BoatClass boatClass2 = domainFactory.getOrCreateBoatClass(null);
+        assertSame(boatClass, boatClass2);
+    }
+}