You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by li...@apache.org on 2012/01/25 08:02:22 UTC
[1/6] git commit: An NPE question.
Updated Branches:
refs/heads/master f3cc56734 -> 976dcbc6b
An NPE question.
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/976dcbc6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/976dcbc6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/976dcbc6
Branch: refs/heads/master
Commit: 976dcbc6bad30011bb783501a095f134197f1454
Parents: 7d77050
Author: Jason Porter <li...@apache.org>
Authored: Tue Jan 24 23:55:29 2012 -0700
Committer: Jason Porter <li...@apache.org>
Committed: Tue Jan 24 23:55:29 2012 -0700
----------------------------------------------------------------------
.../core/impl/config/PropertyFileConfigSource.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/976dcbc6/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/PropertyFileConfigSource.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/PropertyFileConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/PropertyFileConfigSource.java
index a9a0f93..83b0610 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/PropertyFileConfigSource.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/PropertyFileConfigSource.java
@@ -78,7 +78,7 @@ class PropertyFileConfigSource extends BaseConfigSource
}
catch (IOException e)
{
- return null;
+ return null; // TODO: Shouldn't this return an empty Properties? Otherwise we could cause NPE in the getPropertyValue method
}
finally
{