From 539f152868de5600365aaddc80c67bb58f737612 Mon Sep 17 00:00:00 2001
From: Valentin Aitken <bostko@gmail.com>
Date: Wed, 15 Mar 2017 19:06:59 +0200
Subject: [PATCH] Rebind SshFeed workaround

---
 .../apache/brooklyn/feed/AbstractCommandFeed.java    |  4 ++--
 .../java/org/apache/brooklyn/feed/ssh/SshFeed.java   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/brooklyn/feed/AbstractCommandFeed.java b/core/src/main/java/org/apache/brooklyn/feed/AbstractCommandFeed.java
index 95fe7ac82a..2be2c63b53 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/AbstractCommandFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/AbstractCommandFeed.java
@@ -168,11 +168,11 @@ protected void finalize() {
         }
     }
     
-    private static class CommandPollIdentifier {
+    protected static class CommandPollIdentifier {
         final Supplier<String> command;
         final Supplier<Map<String, String>> env;
 
-        private CommandPollIdentifier(Supplier<String> command, Supplier<Map<String, String>> env) {
+        protected CommandPollIdentifier(Supplier<String> command, Supplier<Map<String, String>> env) {
             this.command = checkNotNull(command, "command");
             this.env = checkNotNull(env, "env");
         }
diff --git a/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java b/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java
index 7c365c49ef..8ea24250b3 100644
--- a/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java
+++ b/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java
@@ -18,8 +18,10 @@
  */
 package org.apache.brooklyn.feed.ssh;
 
+import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
+import org.apache.brooklyn.feed.AbstractCommandFeed;
 import org.apache.brooklyn.feed.CommandPollConfig;
 import org.apache.brooklyn.location.ssh.SshMachineLocation;
 import org.apache.brooklyn.util.core.config.ConfigBag;
@@ -104,6 +106,16 @@ public static Builder builder() {
     public SshFeed() {
     }
 
+    /**
+     * @deprecated please refer to {@link AbstractCommandFeed.CommandPollIdentifier}
+     */
+    @Deprecated
+    private static class SshPollIdentifier extends AbstractCommandFeed.CommandPollIdentifier {
+        private SshPollIdentifier(Supplier<String> command, Supplier<Map<String, String>> env) {
+            super(command, env);
+        }
+    }
+
     public SshFeed(final Builder builder) {
         super(builder);
     }