From fadef7d1bf0221d146697e7e25e4787969bbc25a Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Sat, 1 Nov 2014 13:16:22 +0100
Subject: [PATCH] Remove ServiceDiscoveryManager.getFeaturesList()

The method was redundant, getFeatures() did already return a copy of the
features. There is also no need to make it an unmodifiable List.
---
 .../smackx/caps/EntityCapsManager.java           |  2 +-
 .../smackx/disco/ServiceDiscoveryManager.java    | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
index bd546e96f..d0937cfdd 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java
@@ -478,7 +478,7 @@ public class EntityCapsManager extends Manager {
 
         final List<Identity> identities = new LinkedList<Identity>(ServiceDiscoveryManager.getInstanceFor(connection).getIdentities());
         sdm.setNodeInformationProvider(entityNode + '#' + currentCapsVersion, new AbstractNodeInformationProvider() {
-            List<String> features = sdm.getFeaturesList();
+            List<String> features = sdm.getFeatures();
             List<PacketExtension> packetExtensions = sdm.getExtendedInfoAsList();
             @Override
             public List<String> getNodeFeatures() {
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
index 9f02f280d..0f7b96871 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java
@@ -357,23 +357,15 @@ public class ServiceDiscoveryManager extends Manager {
 
     /**
      * Returns the supported features by this XMPP entity.
+     * <p>
+     * The result is a copied modifiable list of the original features.
+     * </p>
      * 
      * @return a List of the supported features by this XMPP entity.
      */
     public List<String> getFeatures() {
         synchronized (features) {
-            return Collections.unmodifiableList(new ArrayList<String>(features));
-        }
-    }
-
-    /**
-     * Returns the supported features by this XMPP entity.
-     * 
-     * @return a copy of the List on the supported features by this XMPP entity.
-     */
-    public List<String> getFeaturesList() {
-        synchronized (features) {
-            return new LinkedList<String>(features);
+            return new ArrayList<String>(features);
         }
     }