From: <mp...@us...> - 2012-05-23 21:31:16
|
Revision: 9845 http://freecol.svn.sourceforge.net/freecol/?rev=9845&view=rev Author: mpope Date: 2012-05-23 21:31:10 +0000 (Wed, 23 May 2012) Log Message: ----------- Fix NPE in getBestPlanTile. Modified Paths: -------------- freecol/trunk/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java Modified: freecol/trunk/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java =================================================================== --- freecol/trunk/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java 2012-05-23 12:37:11 UTC (rev 9844) +++ freecol/trunk/src/net/sf/freecol/server/ai/EuropeanAIPlayer.java 2012-05-23 21:31:10 UTC (rev 9845) @@ -199,7 +199,7 @@ * Gets the best plan for a colony from the tipMap. * * @param colony The <code>Colony</code> to check. - * @return The tile with the best plan for a colony. + * @return The tile with the best plan for a colony, or null if none found. */ public Tile getBestPlanTile(Colony colony) { TileImprovementPlan best = null; @@ -211,7 +211,7 @@ best = tip; } } - return best.getTarget(); + return (best == null) ? null : best.getTarget(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |