[Freecol-commits] SF.net SVN: freecol:[5832] freecol/trunk/src/net/sf/freecol/server/ai/ AIColony.java

[<pr...@us...>]

Revision: 5832
          http://freecol.svn.sourceforge.net/freecol/?rev=5832&view=rev
Author:   pruano
Date:     2009-09-15 11:09:34 +0000 (Tue, 15 Sep 2009)

Log Message:
-----------
Fixes possible NPE.

Modified Paths:
--------------
    freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java

Modified: freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java	2009-09-14 22:14:18 UTC (rev 5831)
+++ freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java	2009-09-15 11:09:34 UTC (rev 5832)
@@ -423,7 +423,8 @@
 
 
     private UnitType getNextExpert(boolean onlyFood) {
-        UnitType bestType = null;
+        // some type should be returned, not null
+        UnitType bestType = FreeCol.getSpecification().getUnitType("model.unit.freeColonist");
         for (WorkLocationPlan plan : colonyPlan.getSortedWorkLocationPlans()) {
             if (plan.getGoodsType().isFoodType() || !onlyFood) {
                 WorkLocation location = plan.getWorkLocation();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.