Version 1.7.4

Riverside-Software · Apr 15, 2016 · ee47011 · ee47011
1 parent 2e600bd
commit ee47011
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 4 deletions.
diff --git a/oedb-plugin/pom.xml b/oedb-plugin/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.sonar.openedge</groupId>
   <artifactId>sonar-openedge-db-plugin</artifactId>
-  <version>1.7.3</version>
+  <version>1.7.4</version>
   <packaging>sonar-plugin</packaging>
 
   <name>OpenEdge DB plugin for SonarQube</name>

diff --git a/openedge-plugin/pom.xml b/openedge-plugin/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.sonar.openedge</groupId>
   <artifactId>sonar-openedge-plugin</artifactId>
-  <version>1.7.3</version>
+  <version>1.7.4</version>
   <packaging>sonar-plugin</packaging>
 
   <name>OpenEdge plugin for SonarQube</name>

diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/checks/KeywordMatch.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/checks/KeywordMatch.java
@@ -35,7 +35,7 @@ public void lint(ParseUnit unit) {
   }
 
   private final void initRule() {
-    keywordNum = NodeTypes.getTypeNum(keyword);
+    keywordNum = NodeTypes.testLiteralsTable(keyword, -1);
   }
 
   @Override

diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/cpd/OpenEdgeCpdTokenizer.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/cpd/OpenEdgeCpdTokenizer.java
@@ -115,6 +115,11 @@ public final void tokenize(final SourceCode source, Tokens cpdTokens) {
       }
     } catch (TokenStreamException | RefactorException | ProparseRuntimeException caught) {
       LOG.error("Could not parse : " + inputFile.relativePath(), caught);
+    } catch (RuntimeException caught) {
+      LOG.error("Runtime exception was caught '{}' - Please report this issue : ", caught.getMessage());
+      for (StackTraceElement element : caught.getStackTrace()) {
+        LOG.error("  {}", element.toString());
+      }
     }
 
     cpdTokens.add(TokenEntry.getEOF());

diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeProparseSensor.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeProparseSensor.java
@@ -159,6 +159,11 @@ public void analyse(Project project, SensorContext context) {
         issue.forRule(
             RuleKey.of(OpenEdgeRulesDefinition.REPOSITORY_KEY, OpenEdgeRulesDefinition.PROPARSE_ERROR_RULEKEY)).at(
                 issue.newLocation().on(file).message(caught.getMessage())).save();
+      } catch (RuntimeException caught) {
+        LOG.error("Runtime exception was caught '{}' - Please report this issue : ", caught.getMessage());
+        for (StackTraceElement element : caught.getStackTrace()) {
+          LOG.error("  {}", element.toString());
+        }
       }
     }
     new File("listingparser.txt").delete();

diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeXREFSensor.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/sensor/OpenEdgeXREFSensor.java
@@ -132,6 +132,11 @@ public void analyse(Project project, SensorContext context) {
           xrefNum++;
         } catch (SAXException | IOException caught) {
           LOG.error("Unable to parse file " + xrefFile.getAbsolutePath(), caught);
+        } catch (RuntimeException caught) {
+          LOG.error("Runtime exception was caught '{}' - Please report this issue : ", caught.getMessage());
+          for (StackTraceElement element : caught.getStackTrace()) {
+            LOG.error("  {}", element.toString());
+          }
         }
       }
     }

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>eu.rssw</groupId>
   <artifactId>sonar-openedge</artifactId>
   <packaging>pom</packaging>
-  <version>1.7.3</version>
+  <version>1.7.4</version>
   <name>OpenEdge plugin for SonarQube</name>
   <url>http://www.riverside-software.fr/</url>
   <description>Open source code analysis for OpenEdge</description>