Code cleaning : Possible null values

diff --git a/sonar-core/src/test/java/org/sonar/core/resource/ResourceIndexerDaoTest.java b/sonar-core/src/test/java/org/sonar/core/resource/ResourceIndexerDaoTest.java
index 49ab76cb84c376cd80f5579ff193ad2db7c4d6de..399c7fa69bc48c597d5810f762c543e227d44cce 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/resource/ResourceIndexerDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/resource/ResourceIndexerDaoTest.java
@@ -101,7 +101,9 @@ public class ResourceIndexerDaoTest extends DaoTestCase {
       rs.next();
       assertThat(rs.getInt(1), greaterThan(0));
     } finally {
-      rs.close();
+      if (null != rs) {
+        rs.close();
+      }
       connection.close();
     }
   }

diff --git a/sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java b/sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java
index 59a508012b5e8b95b52d1566fedbf5bd4758b715..c56109e8940499ad8f48e410d5f478dc1c7dc300 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java
+++ b/sonar-server/src/main/java/org/sonar/server/charts/ChartsServlet.java
@@ -153,8 +153,9 @@ public class ChartsServlet extends HttpServlet {
       }
 
     } catch (Exception e) {
-      LOG.error("Generating chart " + chart.getClass().getName(), e);
-
+      if (chart != null) {
+        LOG.error("Generating chart " + chart.getClass().getName(), e);
+      }
     } finally {
       IOUtils.closeQuietly(out);
     }

diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java
index 32e9821ecb9789cf6a98dd6f8bbbe0640ab4a8cc..d628e86f283e5b6af2246aad4bc4555e767df934 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java
+++ b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/BarChart.java
@@ -168,9 +168,8 @@ public class BarChart extends BaseChartWeb implements DeprecatedChart {
 
       // Categories
       String categoriesParam = params.get(BaseChartWeb.CHART_PARAM_CATEGORIES);
-      boolean categoriesPresent = categoriesParam != null && categoriesParam.length() > 0;
       String[] categoriesSplit;
-      if (categoriesPresent) {
+      if (categoriesParam != null && categoriesParam.length() > 0) {
         categoriesSplit = categoriesParam.split(",");
       } else {
         categoriesSplit = new String[1];
@@ -179,9 +178,8 @@ public class BarChart extends BaseChartWeb implements DeprecatedChart {
 
       // Series
       String seriesParam = params.get(BaseChartWeb.CHART_PARAM_SERIES);
-      boolean seriesPresent = seriesParam != null && seriesParam.length() > 0;
       String[] seriesSplit = null;
-      if (seriesPresent) {
+      if (seriesParam != null && seriesParam.length() > 0) {
         seriesSplit = seriesParam.split(",");
       } else {
         seriesSplit = new String[nbValues];

diff --git a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java
index db5b3d8c16825a5774126a182a30a0d1641fe6f8..e61f82fe9b7293c46a32fc98d84ca5452a4b4890 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java
+++ b/sonar-server/src/main/java/org/sonar/server/charts/deprecated/CustomBarChart.java
@@ -108,9 +108,8 @@ public class CustomBarChart extends BarChart {
 
       // Categories
       String categoriesParam = params.get(CHART_PARAM_CATEGORIES);
-      boolean categoriesPresent = categoriesParam != null && categoriesParam.length() > 0;
       String[] categoriesSplit = null;
-      if (categoriesPresent) {
+      if (categoriesParam != null && categoriesParam.length() > 0) {
         categoriesSplit = categoriesParam.split(",");
       } else {
         categoriesSplit = new String[nbValues];