[Geotools-commits] svn - r38611 - trunk/modules/unsupported/swing/src/main/java/org/geotools/swing

[<svn...@os...>]

Author: mbedward
Date: 2012-03-05 17:32:05 -0800 (Mon, 05 Mar 2012)
New Revision: 38611

Modified:
   trunk/modules/unsupported/swing/src/main/java/org/geotools/swing/JMapPane.java
Log:
GEOT-4056: guard against the map pane setting map for renderer more than once

Modified: trunk/modules/unsupported/swing/src/main/java/org/geotools/swing/JMapPane.java
===================================================================
--- trunk/modules/unsupported/swing/src/main/java/org/geotools/swing/JMapPane.java	2012-03-04 23:06:35 UTC (rev 38610)
+++ trunk/modules/unsupported/swing/src/main/java/org/geotools/swing/JMapPane.java	2012-03-06 01:32:05 UTC (rev 38611)
@@ -85,7 +85,12 @@
     public void setMapContent(MapContent content) {
         super.setMapContent(content);
         if (content != null && renderer != null) {
-            renderer.setMapContent(mapContent);
+            // If the new map content had layers to draw, and this pane is visible,
+            // then the map content will already have been set with the renderer
+            //
+            if (renderer.getMapContent() != content) { // just check reference equality
+                renderer.setMapContent(mapContent);
+            }
         }
     }