abdera-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmsn...@apache.org
Subject svn commit: r1220564 - in /abdera/abdera2: activities/src/main/java/org/apache/abdera2/activities/extra/ activities/src/main/java/org/apache/abdera2/activities/model/ activities/src/main/java/org/apache/abdera2/activities/protocol/basic/ activities/src...
Date Sun, 18 Dec 2011 23:46:03 GMT
Author: jmsnell
Date: Sun Dec 18 23:46:02 2011
New Revision: 1220564

URL: http://svn.apache.org/viewvc?rev=1220564&view=rev
Log:
One more round of findbugs fixes

Modified:
    abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/extra/Jwt.java
    abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/model/ASBase.java
    abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/basic/BasicAdapter.java
    abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/managed/CollectionAdapterManager.java
    abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/CacheControl.java
    abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/EntityTag.java
    abdera/abdera2/common/src/main/java/org/apache/abdera2/common/lang/Lang.java
    abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/MoreFunctions.java
    abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/MorePredicates.java
    abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractCollectionAdapter.java
    abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/RequestTemplateContext.java
    abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/servlet/ServletRequestContext.java
    abdera/abdera2/common/src/main/java/org/apache/abdera2/common/text/UrlEncoding.java
    abdera/abdera2/core/src/main/java/org/apache/abdera2/model/ExtensionIterator.java
    abdera/abdera2/core/src/main/java/org/apache/abdera2/parser/axiom/FOMBuilder.java
    abdera/abdera2/core/src/main/java/org/apache/abdera2/protocol/client/AbderaResponseHandler.java
    abdera/abdera2/examples/src/main/java/org/apache/abdera2/examples/activities/MyActivitiesAdapter.java
    abdera/abdera2/server/src/main/java/org/apache/abdera2/protocol/server/provider/basic/BasicAdapter.java
    abdera/abdera2/server/src/main/java/org/apache/abdera2/protocol/server/provider/managed/CollectionAdapterManager.java
    abdera/abdera2/test/src/main/java/org/apache/abdera2/test/activities/server/SampleBasicAdapter.java
    abdera/abdera2/test/src/main/java/org/apache/abdera2/test/server/basic/SampleBasicAdapter.java

Modified: abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/extra/Jwt.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/extra/Jwt.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/extra/Jwt.java (original)
+++ abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/extra/Jwt.java Sun
Dec 18 23:46:02 2011
@@ -201,7 +201,7 @@ public final class Jwt {
   }
   
   public static byte[] getDataIfValid(Key key, String jwt) throws IOException {
-    if (!validate(key,jwt)) return null;
+    if (!validate(key,jwt)) return new byte[0];
     String[] parts = jwt.split("\\.",3);
     return Base64.decodeBase64(parts[1].getBytes("UTF-8"));
   }

Modified: abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/model/ASBase.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/model/ASBase.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/model/ASBase.java
(original)
+++ abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/model/ASBase.java
Sun Dec 18 23:46:02 2011
@@ -61,7 +61,7 @@ import static com.google.common.collect.
 public class ASBase 
   implements Iterable<String>, Cloneable {
   
-  public static Logger log = Logger.getLogger(ASBase.class.getName());
+  public final static Logger log = Logger.getLogger(ASBase.class.getName());
   
   public static ASBuilder make() {
     return new ASBuilder();

Modified: abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/basic/BasicAdapter.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/basic/BasicAdapter.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/basic/BasicAdapter.java
(original)
+++ abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/basic/BasicAdapter.java
Sun Dec 18 23:46:02 2011
@@ -53,7 +53,7 @@ import static org.apache.abdera2.common.
 @SuppressWarnings("unchecked")
 public abstract class BasicAdapter extends ManagedCollectionAdapter {
 
-    public static Logger logger = Logger.getLogger(BasicAdapter.class.getName());
+    public final static Logger logger = Logger.getLogger(BasicAdapter.class.getName());
 
     protected BasicAdapter(FeedConfiguration config) {
         super(config);

Modified: abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/managed/CollectionAdapterManager.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/managed/CollectionAdapterManager.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/managed/CollectionAdapterManager.java
(original)
+++ abdera/abdera2/activities/src/main/java/org/apache/abdera2/activities/protocol/managed/CollectionAdapterManager.java
Sun Dec 18 23:46:02 2011
@@ -30,10 +30,10 @@ import org.apache.abdera2.common.protoco
 
 public class CollectionAdapterManager {
 
-    public static Logger logger = Logger.getLogger(CollectionAdapterManager.class.getName());
+    public final static Logger logger = Logger.getLogger(CollectionAdapterManager.class.getName());
 
     // maps a feed id to an adapter instance
-    protected static Map<String, CollectionAdapter> adapterInstanceMap = 
+    protected final static Map<String, CollectionAdapter> adapterInstanceMap = 
       new HashMap<String, CollectionAdapter>();
 
     protected final ServerConfiguration config;

Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/CacheControl.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/CacheControl.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/CacheControl.java (original)
+++ abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/CacheControl.java Sun
Dec 18 23:46:02 2011
@@ -280,17 +280,17 @@ public final class CacheControl implemen
                           REVALIDATE = 32,
                           PROXYREVALIDATE = 64,
                           ONLYIFCACHED = 128;
-  protected final int flags;
-  protected final Iterable<String> 
+  private final int flags;
+  private final Iterable<String> 
     nocache_headers,
     private_headers;
-  protected final long max_age,
+  private final long max_age,
                  max_stale,
                  min_fresh,
                  smax_age,
                  staleiferror,
                  stalewhilerevalidate;
-  protected final ImmutableMap<String,Object> exts;
+  private final ImmutableMap<String,Object> exts;
   
   CacheControl(Builder builder) {
     this.flags = builder.flags;

Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/EntityTag.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/EntityTag.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/EntityTag.java (original)
+++ abdera/abdera2/common/src/main/java/org/apache/abdera2/common/http/EntityTag.java Sun
Dec 18 23:46:02 2011
@@ -366,14 +366,14 @@ public class EntityTag 
       };
     }
     
-    public static Function<String, EntityTag> parser = 
+    public final static Function<String, EntityTag> parser = 
       new Function<String,EntityTag>() {
         public EntityTag apply(String input) {
           return input != null ? parse(input) : null;
         }
     };
     
-    public static Function<String, Iterable<EntityTag>> parseMultiple = 
+    public final static Function<String, Iterable<EntityTag>> parseMultiple =

       new Function<String,Iterable<EntityTag>>() {
         public Iterable<EntityTag> apply(String input) {
           return input != null ? 

Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/lang/Lang.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/lang/Lang.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/common/src/main/java/org/apache/abdera2/common/lang/Lang.java (original)
+++ abdera/abdera2/common/src/main/java/org/apache/abdera2/common/lang/Lang.java Sun Dec 18
23:46:02 2011
@@ -20,10 +20,13 @@ package org.apache.abdera2.common.lang;
 //import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Locale;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.abdera2.common.lang.Subtag.Type;
+import org.apache.abdera2.common.misc.MoreFunctions;
+
 import static org.apache.abdera2.common.misc.MoreFunctions.*;
 import static org.apache.abdera2.common.text.CharUtils.*;
 import static com.google.common.base.Preconditions.checkArgument;
@@ -331,17 +334,16 @@ public final class Lang 
       return new Lang(Locale.getDefault());
     }
     
-    private static Lang[] available_langs = 
-      each(
+    private final static Set<Lang> available_langs = 
+      MoreFunctions.<Locale,Lang>seteach(
         Locale.getAvailableLocales(), 
         new Function<Locale,Lang>() {
           public Lang apply(Locale input) {
             return new Lang(input);
           }
-        },
-        Lang.class);
+        });
     
-    public static Lang[] getAvailableLangs() {
+    public static Set<Lang> getAvailableLangs() {
       return available_langs;
     }
     

Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/MoreFunctions.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/MoreFunctions.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/MoreFunctions.java
(original)
+++ abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/MoreFunctions.java
Sun Dec 18 23:46:02 2011
@@ -374,6 +374,18 @@ public final class MoreFunctions {
     }
     return list.build();
   }
+
+  public static <T,X>Set<X> seteach(T[] i, Function<T,X> apply) {
+    ImmutableSet.Builder<X> list = ImmutableSet.builder();
+    for (T t : i) {
+      try {
+        list.add(apply.apply(t));
+      } catch (Throwable e) {
+        throw ExceptionHelper.propogate(e);
+      }
+    }
+    return list.build();
+  }
   
   public static <T,X>Iterable<X> each(Iterable<T> i, Function<T,X>
apply, Predicate<T> test) {
     ImmutableList.Builder<X> list = ImmutableList.builder();

Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/MorePredicates.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/MorePredicates.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/MorePredicates.java
(original)
+++ abdera/abdera2/common/src/main/java/org/apache/abdera2/common/misc/MorePredicates.java
Sun Dec 18 23:46:02 2011
@@ -111,7 +111,7 @@ public final class MorePredicates {
     return in(_class,method,Arrays.asList(items));
   }
   
-  public static Selector<Long> longNotNegativeOrNull = 
+  public final static Selector<Long> longNotNegativeOrNull = 
     new AbstractSelector<Long>() {
       public boolean select(Object item) {
         if (item == null) return false;
@@ -121,7 +121,7 @@ public final class MorePredicates {
       }
   };
   
-  public static Selector<Integer> intNotNegativeOrNull = 
+  public final static Selector<Integer> intNotNegativeOrNull = 
     new AbstractSelector<Integer>() {
       public boolean select(Object item) {
         if (item == null) return false;
@@ -131,7 +131,7 @@ public final class MorePredicates {
       }
   };
   
-  public static Selector<Short> shortNotNegativeOrNull = 
+  public final static Selector<Short> shortNotNegativeOrNull = 
     new AbstractSelector<Short>() {
       public boolean select(Object item) {
         if (item == null) return false;

Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractCollectionAdapter.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractCollectionAdapter.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractCollectionAdapter.java
(original)
+++ abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/AbstractCollectionAdapter.java
Sun Dec 18 23:46:02 2011
@@ -209,7 +209,7 @@ public abstract class AbstractCollection
         }
     };
     
-    public static Predicate<RequestContext> HAS_NO_ENTITY = 
+    public final static Predicate<RequestContext> HAS_NO_ENTITY = 
       new Predicate<RequestContext>() {
         public boolean apply(RequestContext input) {
           String method = input.getMethod();

Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/RequestTemplateContext.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/RequestTemplateContext.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/RequestTemplateContext.java
(original)
+++ abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/RequestTemplateContext.java
Sun Dec 18 23:46:02 2011
@@ -31,7 +31,7 @@ public class RequestTemplateContext 
   
   private String[] split(String val) {
       if (val.equals(""))
-          return null;
+          return new String[0];
       String[] segments = val.split("/");
       return segments.length > 0 ? segments : null;
   }

Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/servlet/ServletRequestContext.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/servlet/ServletRequestContext.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/servlet/ServletRequestContext.java
(original)
+++ abdera/abdera2/common/src/main/java/org/apache/abdera2/common/protocol/servlet/ServletRequestContext.java
Sun Dec 18 23:46:02 2011
@@ -240,7 +240,7 @@ public class ServletRequestContext 
       case SESSIONACCESSED:
           return (session != null) ? new Date(session.getLastAccessedTime()) : null;
       case SESSIONTIMEOUT:
-          return (session != null) ? new Integer(session.getMaxInactiveInterval()) : new
Integer((-1));
+          return (session != null) ? Integer.valueOf(session.getMaxInactiveInterval()) :
Integer.valueOf((-1));
       case CHARACTERENCODING:
           return request.getCharacterEncoding();
       case LOCALES:

Modified: abdera/abdera2/common/src/main/java/org/apache/abdera2/common/text/UrlEncoding.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/common/src/main/java/org/apache/abdera2/common/text/UrlEncoding.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/common/src/main/java/org/apache/abdera2/common/text/UrlEncoding.java (original)
+++ abdera/abdera2/common/src/main/java/org/apache/abdera2/common/text/UrlEncoding.java Sun
Dec 18 23:46:02 2011
@@ -43,7 +43,7 @@ import com.google.common.base.Function;
 public final class UrlEncoding {
 
     private static final String DEFAULT_ENCODING = "UTF-8";
-    public final static char[] HEX = 
+    private final static char[] HEX = 
       {'0', '1', '2', '3', '4', '5', '6', '7', 
        '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 

Modified: abdera/abdera2/core/src/main/java/org/apache/abdera2/model/ExtensionIterator.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/core/src/main/java/org/apache/abdera2/model/ExtensionIterator.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/core/src/main/java/org/apache/abdera2/model/ExtensionIterator.java (original)
+++ abdera/abdera2/core/src/main/java/org/apache/abdera2/model/ExtensionIterator.java Sun
Dec 18 23:46:02 2011
@@ -93,7 +93,7 @@ public class ExtensionIterator implement
 
     private boolean isQNamesMatch(QName elementQName, String namespace) {
         String elns = elementQName == null ? "" : elementQName.getNamespaceURI();
-        boolean namespaceURIMatch = (namespace == null) || (namespace == "") || elns.equals(namespace);
+        boolean namespaceURIMatch = (namespace == null) || ("".equals(namespace)) || elns.equals(namespace);
         if (!namespaceURIMatch && extns != null && !elns.equals(extns))
             return false;
         else

Modified: abdera/abdera2/core/src/main/java/org/apache/abdera2/parser/axiom/FOMBuilder.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/core/src/main/java/org/apache/abdera2/parser/axiom/FOMBuilder.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/core/src/main/java/org/apache/abdera2/parser/axiom/FOMBuilder.java (original)
+++ abdera/abdera2/core/src/main/java/org/apache/abdera2/parser/axiom/FOMBuilder.java Sun
Dec 18 23:46:02 2011
@@ -121,7 +121,7 @@ public class FOMBuilder extends StAXOMBu
             ctype = Content.Type.typeFromString(type);
             if (ctype == null)
                 throw new FOMUnsupportedContentTypeException(type);
-        } else if (type == null && src != null) {
+        } else if (src != null) {
             ctype = Content.Type.MEDIA;
         }
         return ctype;

Modified: abdera/abdera2/core/src/main/java/org/apache/abdera2/protocol/client/AbderaResponseHandler.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/core/src/main/java/org/apache/abdera2/protocol/client/AbderaResponseHandler.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/core/src/main/java/org/apache/abdera2/protocol/client/AbderaResponseHandler.java
(original)
+++ abdera/abdera2/core/src/main/java/org/apache/abdera2/protocol/client/AbderaResponseHandler.java
Sun Dec 18 23:46:02 2011
@@ -55,7 +55,7 @@ class AbderaResponseHandler 
   
   public AbderaResponseHandler(Abdera abdera, ParserOptions options) {
     this.abdera = abdera;
-    this.options = null;
+    this.options = options;
   }
   
   public Document<? extends Element> handleResponse(HttpResponse response) throws ClientProtocolException,

Modified: abdera/abdera2/examples/src/main/java/org/apache/abdera2/examples/activities/MyActivitiesAdapter.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/examples/src/main/java/org/apache/abdera2/examples/activities/MyActivitiesAdapter.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/examples/src/main/java/org/apache/abdera2/examples/activities/MyActivitiesAdapter.java
(original)
+++ abdera/abdera2/examples/src/main/java/org/apache/abdera2/examples/activities/MyActivitiesAdapter.java
Sun Dec 18 23:46:02 2011
@@ -34,7 +34,7 @@ public class MyActivitiesAdapter extends
 
     private static final String ERROR_INVALID_ENTRY = "No Such Entry in the Feed";
 
-    public static Logger logger = Logger.getLogger(MyActivitiesAdapter.class.getName());
+    public final static Logger logger = Logger.getLogger(MyActivitiesAdapter.class.getName());
     protected List<Item> entries = new LinkedList<Item>();
 
     private static class Item {

Modified: abdera/abdera2/server/src/main/java/org/apache/abdera2/protocol/server/provider/basic/BasicAdapter.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/server/src/main/java/org/apache/abdera2/protocol/server/provider/basic/BasicAdapter.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/server/src/main/java/org/apache/abdera2/protocol/server/provider/basic/BasicAdapter.java
(original)
+++ abdera/abdera2/server/src/main/java/org/apache/abdera2/protocol/server/provider/basic/BasicAdapter.java
Sun Dec 18 23:46:02 2011
@@ -43,7 +43,7 @@ import com.google.common.base.Function;
  */
 public abstract class BasicAdapter extends ManagedCollectionAdapter {
 
-    public static Logger logger = 
+    public final static Logger logger = 
       Logger.getLogger(BasicAdapter.class.getName());
 
     protected BasicAdapter(Abdera abdera, FeedConfiguration config) {

Modified: abdera/abdera2/server/src/main/java/org/apache/abdera2/protocol/server/provider/managed/CollectionAdapterManager.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/server/src/main/java/org/apache/abdera2/protocol/server/provider/managed/CollectionAdapterManager.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/server/src/main/java/org/apache/abdera2/protocol/server/provider/managed/CollectionAdapterManager.java
(original)
+++ abdera/abdera2/server/src/main/java/org/apache/abdera2/protocol/server/provider/managed/CollectionAdapterManager.java
Sun Dec 18 23:46:02 2011
@@ -31,10 +31,10 @@ import org.apache.abdera2.common.protoco
 
 public class CollectionAdapterManager {
 
-    public static Logger logger = Logger.getLogger(CollectionAdapterManager.class.getName());
+    public final static Logger logger = Logger.getLogger(CollectionAdapterManager.class.getName());
 
     // maps a feed id to an adapter instance
-    protected static Map<String, CollectionAdapter> adapterInstanceMap = 
+    protected final static Map<String, CollectionAdapter> adapterInstanceMap = 
       new HashMap<String, CollectionAdapter>();
 
     protected final Abdera abdera;

Modified: abdera/abdera2/test/src/main/java/org/apache/abdera2/test/activities/server/SampleBasicAdapter.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/test/src/main/java/org/apache/abdera2/test/activities/server/SampleBasicAdapter.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/test/src/main/java/org/apache/abdera2/test/activities/server/SampleBasicAdapter.java
(original)
+++ abdera/abdera2/test/src/main/java/org/apache/abdera2/test/activities/server/SampleBasicAdapter.java
Sun Dec 18 23:46:02 2011
@@ -33,7 +33,7 @@ public class SampleBasicAdapter extends 
 
     private static final String ERROR_INVALID_ENTRY = "No Such Entry in the Feed";
 
-    public static Logger logger = Logger.getLogger(SampleBasicAdapter.class.getName());
+    public final static Logger logger = Logger.getLogger(SampleBasicAdapter.class.getName());
     protected List<Item> entries = new LinkedList<Item>();
 
     private static class Item {

Modified: abdera/abdera2/test/src/main/java/org/apache/abdera2/test/server/basic/SampleBasicAdapter.java
URL: http://svn.apache.org/viewvc/abdera/abdera2/test/src/main/java/org/apache/abdera2/test/server/basic/SampleBasicAdapter.java?rev=1220564&r1=1220563&r2=1220564&view=diff
==============================================================================
--- abdera/abdera2/test/src/main/java/org/apache/abdera2/test/server/basic/SampleBasicAdapter.java
(original)
+++ abdera/abdera2/test/src/main/java/org/apache/abdera2/test/server/basic/SampleBasicAdapter.java
Sun Dec 18 23:46:02 2011
@@ -39,7 +39,7 @@ public class SampleBasicAdapter extends 
     private static final String ERROR_DUP_ENTRY = "Entry Already Exists";
     private static final String ERROR_INVALID_ENTRY = "No Such Entry in the Feed";
 
-    public static Logger logger = Logger.getLogger(SampleBasicAdapter.class.getName());
+    public final static Logger logger = Logger.getLogger(SampleBasicAdapter.class.getName());
     protected HashMap<String, byte[]> entries = new HashMap<String, byte[]>();
 
     public SampleBasicAdapter(Abdera abdera, FeedConfiguration config) {



Mime
View raw message