fix coverity defect

nobodyiam · nobodyiam · commit d2f32587215d · 2017-01-25T14:37:00.000+08:00
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/ds/ApolloDataSourceProvider.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/ds/ApolloDataSourceProvider.java
@@ -46,7 +46,7 @@ public DataSourcesDef defineDatasources() {
          String appId = Foundation.app().getAppId();
          String envType = Foundation.server().getEnvType();
 
-         if (file.hasContent()) {
+         if (file != null && file.hasContent()) {
             String content = file.getContent();
 
             m_logger.info(String.format("Found datasources.xml from Apollo(env=%s, app.id=%s)!", envType, appId));
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PlainTextConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PlainTextConfigFile.java
@@ -12,7 +12,7 @@ public PlainTextConfigFile(String namespace, ConfigRepository configRepository)
 
   @Override
   public String getContent() {
-    if (m_configProperties.get() == null) {
+    if (!this.hasContent()) {
       return null;
     }
     return m_configProperties.get().getProperty(ConfigConsts.CONFIG_FILE_CONTENT_KEY);
diff --git a/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesConfigFile.java b/apollo-client/src/main/java/com/ctrip/framework/apollo/internals/PropertiesConfigFile.java
@@ -34,7 +34,7 @@ public String getContent() {
   }
 
   String doGetContent() {
-    if (m_configProperties.get() == null) {
+    if (!this.hasContent()) {
       return null;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public PlainTextConfigFile(String namespace, ConfigRepository configRepository)`
`12`	`12`
`13`	`13`	`@Override`
`14`	`14`	`public String getContent() {`
`15`		`- if (m_configProperties.get() == null) {`
	`15`	`+ if (!this.hasContent()) {`
`16`	`16`	`return null;`
`17`	`17`	`}`
`18`	`18`	`return m_configProperties.get().getProperty(ConfigConsts.CONFIG_FILE_CONTENT_KEY);`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public String getContent() {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`String doGetContent() {`
`37`		`- if (m_configProperties.get() == null) {`
	`37`	`+ if (!this.hasContent()) {`
`38`	`38`	`return null;`
`39`	`39`	`}`
`40`	`40`