You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/01/07 11:05:07 UTC
svn commit: r1056234 -
/tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
Author: markt
Date: Fri Jan 7 10:05:07 2011
New Revision: 1056234
URL: http://svn.apache.org/viewvc?rev=1056234&view=rev
Log:
Fix various warnings
Modified:
tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
Modified: tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java?rev=1056234&r1=1056233&r2=1056234&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/DataSourceLinkFactory.java Fri Jan 7 10:05:07 2011
@@ -31,11 +31,8 @@ import javax.naming.Name;
import javax.naming.NamingException;
import javax.naming.RefAddr;
import javax.naming.Reference;
-import javax.naming.spi.ObjectFactory;
import javax.sql.DataSource;
-import org.apache.naming.ResourceLinkRef;
-
/**
@@ -43,8 +40,7 @@ import org.apache.naming.ResourceLinkRef
*
* @author Filip Hanik
*/
-public class DataSourceLinkFactory extends ResourceLinkFactory
- implements ObjectFactory {
+public class DataSourceLinkFactory extends ResourceLinkFactory {
// -------------------------------------------------- ObjectFactory Methods
@@ -55,6 +51,7 @@ public class DataSourceLinkFactory exten
*
* @param obj The reference object describing the DataSource
*/
+ @Override
public Object getObjectInstance(Object obj, Name name, Context nameCtx,
Hashtable<?,?> environment)
throws NamingException {
@@ -103,6 +100,7 @@ public class DataSourceLinkFactory exten
this.password = password;
}
+ @Override
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
if ("getConnection".equals(method.getName()) && args.length==0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org