[ jEdit-commits ] SF.net SVN: jedit:[22028] jEdit/branches/5.0.x

[<ez...@us...>]

Revision: 22028
          http://jedit.svn.sourceforge.net/jedit/?rev=22028&view=rev
Author:   ezust
Date:     2012-08-19 04:17:10 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
Merge req# 3557444: Fix for plugin removal

Modified Paths:
--------------
    jEdit/branches/5.0.x/doc/CHANGES.txt
    jEdit/branches/5.0.x/org/gjt/sp/jedit/PluginJAR.java

Property Changed:
----------------
    jEdit/branches/5.0.x/


Property changes on: jEdit/branches/5.0.x
___________________________________________________________________
Modified: svn:mergeinfo
   - /jEdit/branches/docking_framework:13128-13258
/jEdit/trunk:21791-21792,21801,21816,21880,21917,21933,21965-21966,21974,21981
   + /jEdit/branches/docking_framework:13128-13258
/jEdit/trunk:21791-21792,21801,21816,21880,21917,21933,21965-21966,21974,21981,22000

Modified: jEdit/branches/5.0.x/doc/CHANGES.txt
===================================================================
--- jEdit/branches/5.0.x/doc/CHANGES.txt	2012-08-18 09:39:22 UTC (rev 22027)
+++ jEdit/branches/5.0.x/doc/CHANGES.txt	2012-08-19 04:17:10 UTC (rev 22028)
@@ -11,6 +11,9 @@
 
 - Fix "Customize This Menu..." item in context menu options (#3554895 Tom Power)
 
+- Fix a case where a NPE occurs when removing a plugin
+  (#3557441 Matthieu Casanova)
+
 - Recognizing "Extra word characters" in "Whole word" option in
   searches (bug #3522497, patch #3543524 Malathi)
 

Modified: jEdit/branches/5.0.x/org/gjt/sp/jedit/PluginJAR.java
===================================================================
--- jEdit/branches/5.0.x/org/gjt/sp/jedit/PluginJAR.java	2012-08-18 09:39:22 UTC (rev 22027)
+++ jEdit/branches/5.0.x/org/gjt/sp/jedit/PluginJAR.java	2012-08-19 04:17:10 UTC (rev 22028)
@@ -681,8 +681,16 @@
   				listModel.add(jarPath);
   				PluginJAR jar = jEdit.getPluginJAR(
   					jarPath);
-  				transitiveClosure(jar.getDependentPlugins(),
-  					listModel);
+				if (jar == null)
+				{
+					Log.log(Log.WARNING, PluginJAR.class, "The jar file " + jarPath +
+						" doesn't exist, the plugin may have been partially removed");
+				}
+				else
+				{
+					transitiveClosure(jar.getDependentPlugins(),
+									  listModel);
+				}
   			}
   		}
   	} //}}}

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