avoid NPE

[phpeclipse.git] / net.sourceforge.phpeclipse / src / test / PHPParserManager.java

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParserManager.java b/net.sourceforge.phpeclipse/src/test/PHPParserManager.java
index a0c1802..4f42264 100644 (file)
--- a/net.sourceforge.phpeclipse/src/test/PHPParserManager.java
+++ b/net.sourceforge.phpeclipse/src/test/PHPParserManager.java
@@ -6,7 +6,6 @@ import org.eclipse.core.resources.IFile;
 
 public class PHPParserManager {
 
-  private static PHPParserSuperclass parser;
 
   public static PHPParserSuperclass getParser(IFile fileToParse) {
     try {
@@ -14,10 +13,7 @@ public class PHPParserManager {
       if (PHPeclipsePlugin.PHPPARSER == PHPeclipsePlugin.PHPPARSER_ORIGINAL) {
         actualParser = (PHPParserSuperclass) Class.forName(PHPeclipsePlugin.PHPPARSER).newInstance();
       } else {
-        if (parser == null) {
-          parser = (PHPParserSuperclass) Class.forName(PHPeclipsePlugin.PHPPARSER).newInstance();
-        }
-        actualParser = parser;
+        actualParser = (PHPParserSuperclass) Class.forName(PHPeclipsePlugin.PHPPARSER).newInstance();
       }
       actualParser.setFileToParse(fileToParse);
       return actualParser;
@@ -37,10 +33,7 @@ public class PHPParserManager {
       if (PHPeclipsePlugin.PHPPARSER == PHPeclipsePlugin.PHPPARSER_ORIGINAL) {
         actualParser = (PHPParserSuperclass) Class.forName(PHPeclipsePlugin.PHPPARSER).newInstance();
       } else {
-        if (parser == null) {
-          parser = (PHPParserSuperclass) Class.forName(PHPeclipsePlugin.PHPPARSER).newInstance();
-        }
-        actualParser = parser;
+        actualParser = (PHPParserSuperclass) Class.forName(PHPeclipsePlugin.PHPPARSER).newInstance();
       }
       return actualParser;
     } catch (InstantiationException e) {