You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2012/01/25 09:50:23 UTC
git commit: fixed check-style issues and possible npe
Updated Branches:
refs/heads/master 976dcbc6b -> da47fa57e
fixed check-style issues and possible npe
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/da47fa57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/da47fa57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/da47fa57
Branch: refs/heads/master
Commit: da47fa57ec9111c87b027a8ca11005cebafcaeb3
Parents: 976dcbc
Author: gpetracek <gp...@apache.org>
Authored: Wed Jan 25 09:49:55 2012 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Wed Jan 25 09:49:55 2012 +0100
----------------------------------------------------------------------
.../metadata/builder/AnnotatedCallableImpl.java | 1 +
.../core/impl/config/PropertyFileConfigSource.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/da47fa57/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedCallableImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedCallableImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedCallableImpl.java
index 953af8d..6ee8920 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedCallableImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedCallableImpl.java
@@ -50,6 +50,7 @@ abstract class AnnotatedCallableImpl<X, Y extends Member> extends AnnotatedMembe
/**
* {@inheritDoc}
*/
+ @Override
public List<AnnotatedParameter<X>> getParameters()
{
return Collections.unmodifiableList(parameters);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/da47fa57/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 83b0610..a1011a7 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; // TODO: Shouldn't this return an empty Properties? Otherwise we could cause NPE in the getPropertyValue method
+ throw new IllegalStateException(e);
}
finally
{