Fixed a couple of FindBugs warnings
svn path=/trunk/; revision=337
diff --git a/src/jsr311-api/nbproject/build-impl.xml b/src/jsr311-api/nbproject/build-impl.xml
index 519f62b..8d5ebe7 100644
--- a/src/jsr311-api/nbproject/build-impl.xml
+++ b/src/jsr311-api/nbproject/build-impl.xml
@@ -19,7 +19,7 @@
- cleanup
-->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="JSR311_API-impl">
+<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="JSR311_API-impl">
<target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
<!--
======================
@@ -235,7 +235,9 @@
<attribute default="${build.classes.dir}" name="dir"/>
<sequential>
<nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
+ <fileset dir="@{dir}" includes="${fix.classes}">
+ <include name="${fix.includes}*.class"/>
+ </fileset>
</nbjpdareload>
</sequential>
</macrodef>
diff --git a/src/jsr311-api/nbproject/genfiles.properties b/src/jsr311-api/nbproject/genfiles.properties
index c8df92b..38516f5 100644
--- a/src/jsr311-api/nbproject/genfiles.properties
+++ b/src/jsr311-api/nbproject/genfiles.properties
@@ -6,5 +6,5 @@
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=ec6a5d82
nbproject/build-impl.xml.jax-ws.CRC32=749ccaa7
-nbproject/build-impl.xml.script.CRC32=bf78171a
-nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08
+nbproject/build-impl.xml.script.CRC32=69450dff
+nbproject/build-impl.xml.stylesheet.CRC32=487672f9
diff --git a/src/jsr311-api/src/javax/ws/rs/WebApplicationException.java b/src/jsr311-api/src/javax/ws/rs/WebApplicationException.java
index 171b068..bbff086 100644
--- a/src/jsr311-api/src/javax/ws/rs/WebApplicationException.java
+++ b/src/jsr311-api/src/javax/ws/rs/WebApplicationException.java
@@ -82,7 +82,7 @@
public WebApplicationException(Throwable cause, Response response) {
super(cause);
if (response==null)
- response = Response.serverError().build();
+ this.response = Response.serverError().build();
else
this.response = response;
}
diff --git a/src/jsr311-api/src/javax/ws/rs/ext/FactoryFinder.java b/src/jsr311-api/src/javax/ws/rs/ext/FactoryFinder.java
index babb9d5..a9ee62c 100644
--- a/src/jsr311-api/src/javax/ws/rs/ext/FactoryFinder.java
+++ b/src/jsr311-api/src/javax/ws/rs/ext/FactoryFinder.java
@@ -84,7 +84,7 @@
String serviceId = "META-INF/services/" + factoryId;
// try to find services in CLASSPATH
try {
- InputStream is = null;
+ InputStream is;
if (classLoader == null) {
is = ClassLoader.getSystemResourceAsStream(serviceId);
} else {
