Author: markt
Date: Mon Mar 7 16:46:45 2011
New Revision: 1078850
URL: http://svn.apache.org/viewvc?rev=1078850&view=rev
Log:
Fix Eclipse and FindBugs warnings
Removed unused code
Removed:
tomcat/trunk/java/org/apache/naming/NamingService.java
tomcat/trunk/java/org/apache/naming/NamingServiceMBean.java
Modified:
tomcat/trunk/java/org/apache/naming/ContextAccessController.java
tomcat/trunk/java/org/apache/naming/NameParserImpl.java
tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
tomcat/trunk/java/org/apache/naming/NamingContextEnumeration.java
tomcat/trunk/java/org/apache/naming/ServiceRef.java
Modified: tomcat/trunk/java/org/apache/naming/ContextAccessController.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ContextAccessController.java?rev=1078850&r1=1078849&r2=1078850&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ContextAccessController.java (original)
+++ tomcat/trunk/java/org/apache/naming/ContextAccessController.java Mon Mar 7
16:46:45 2011
@@ -87,11 +87,7 @@ public class ContextAccessController {
public static boolean checkSecurityToken
(Object name, Object token) {
Object refToken = securityTokens.get(name);
- if (refToken == null)
- return (true);
- if ((refToken != null) && (refToken.equals(token)))
- return (true);
- return (false);
+ return (refToken == null || refToken.equals(token));
}
Modified: tomcat/trunk/java/org/apache/naming/NameParserImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NameParserImpl.java?rev=1078850&r1=1078849&r2=1078850&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NameParserImpl.java (original)
+++ tomcat/trunk/java/org/apache/naming/NameParserImpl.java Mon Mar 7 16:46:45
2011
@@ -47,6 +47,7 @@ public class NameParserImpl
* @return A non-null parsed form of the name using the naming convention
* of this parser.
*/
+ @Override
public Name parse(String name)
throws NamingException {
return new CompositeName(name);
Modified:
tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java?rev=1078850&r1=1078849&r2=1078850&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
(original)
+++ tomcat/trunk/java/org/apache/naming/NamingContextBindingsEnumeration.java
Mon Mar 7 16:46:45 2011
@@ -67,6 +67,7 @@ public class NamingContextBindingsEnumer
/**
* Retrieves the next element in the enumeration.
*/
+ @Override
public Binding next()
throws NamingException {
return nextElementInternal();
@@ -76,6 +77,7 @@ public class NamingContextBindingsEnumer
/**
* Determines whether there are any more elements in the enumeration.
*/
+ @Override
public boolean hasMore()
throws NamingException {
return iterator.hasNext();
@@ -85,16 +87,19 @@ public class NamingContextBindingsEnumer
/**
* Closes this enumeration.
*/
+ @Override
public void close()
throws NamingException {
}
+ @Override
public boolean hasMoreElements() {
return iterator.hasNext();
}
+ @Override
public Binding nextElement() {
try {
return nextElementInternal();
Modified: tomcat/trunk/java/org/apache/naming/NamingContextEnumeration.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContextEnumeration.java?rev=1078850&r1=1078849&r2=1078850&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingContextEnumeration.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContextEnumeration.java Mon Mar
7 16:46:45 2011
@@ -58,6 +58,7 @@ public class NamingContextEnumeration
/**
* Retrieves the next element in the enumeration.
*/
+ @Override
public NameClassPair next()
throws NamingException {
return nextElement();
@@ -67,6 +68,7 @@ public class NamingContextEnumeration
/**
* Determines whether there are any more elements in the enumeration.
*/
+ @Override
public boolean hasMore()
throws NamingException {
return iterator.hasNext();
@@ -76,16 +78,19 @@ public class NamingContextEnumeration
/**
* Closes this enumeration.
*/
+ @Override
public void close()
throws NamingException {
}
+ @Override
public boolean hasMoreElements() {
return iterator.hasNext();
}
+ @Override
public NameClassPair nextElement() {
NamingEntry entry = iterator.next();
return new NameClassPair(entry.name, entry.value.getClass().getName());
Modified: tomcat/trunk/java/org/apache/naming/ServiceRef.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ServiceRef.java?rev=1078850&r1=1078849&r2=1078850&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ServiceRef.java (original)
+++ tomcat/trunk/java/org/apache/naming/ServiceRef.java Mon Mar 7 16:46:45 2011
@@ -96,7 +96,8 @@ public class ServiceRef extends Referenc
null, null);
}
- public ServiceRef(String refname, String serviceInterface, String[]
serviceQname,
+ public ServiceRef(@SuppressWarnings("unused") String refname,
+ String serviceInterface, String[] serviceQname,
String wsdl, String jaxrpcmapping,
String factory, String factoryLocation) {
super(serviceInterface, factory, factoryLocation);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
