You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/02/02 04:14:10 UTC
[1/4] guacamole-client git commit: GUACAMOLE-96: Reference Map.Entry
rather than HashMap.Entry.
Repository: guacamole-client
Updated Branches:
refs/heads/master 07d030785 -> 798349e23
GUACAMOLE-96: Reference Map.Entry rather than HashMap.Entry.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/4a785757
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/4a785757
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/4a785757
Branch: refs/heads/master
Commit: 4a7857571e2375e00d2d22d2d09ddbcb0013236b
Parents: 07d0307
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Feb 1 12:41:00 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Feb 1 12:41:00 2018 -0800
----------------------------------------------------------------------
.../apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/4a785757/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
index e2cb438..797965a 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
@@ -23,6 +23,7 @@ import java.util.AbstractCollection;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
/**
* Map of arbitrary attribute name/value pairs which can alternatively be
@@ -129,7 +130,7 @@ public class ArbitraryAttributeMap extends HashMap<String, String> {
public Iterator<ArbitraryAttributeModel> iterator() {
// Get iterator over all string name/value entries
- final Iterator<Entry<String, String>> iterator = entrySet().iterator();
+ final Iterator<Map.Entry<String, String>> iterator = entrySet().iterator();
// Dynamically translate each string name/value entry into a
// corresponding attribute model object as iteration continues
@@ -142,7 +143,7 @@ public class ArbitraryAttributeMap extends HashMap<String, String> {
@Override
public ArbitraryAttributeModel next() {
- Entry<String, String> entry = iterator.next();
+ Map.Entry<String, String> entry = iterator.next();
return new ArbitraryAttributeModel(entry.getKey(),
entry.getValue());
}
[4/4] guacamole-client git commit: GUACAMOLE-96: Merge restore
compatibility with 1.7 JDK.
Posted by vn...@apache.org.
GUACAMOLE-96: Merge restore compatibility with 1.7 JDK.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/798349e2
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/798349e2
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/798349e2
Branch: refs/heads/master
Commit: 798349e2310d3ba90e3a1d5fa276c2c8efc19c82
Parents: 07d0307 3a90dbb
Author: Nick Couchman <vn...@apache.org>
Authored: Thu Feb 1 23:10:55 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Thu Feb 1 23:10:55 2018 -0500
----------------------------------------------------------------------
.../auth/jdbc/base/ArbitraryAttributeMap.java | 28 ++++++++++++++++----
1 file changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[3/4] guacamole-client git commit: GUACAMOLE-96: Do not rely on
Map.remove(key, value) which is specific to Java 8.
Posted by vn...@apache.org.
GUACAMOLE-96: Do not rely on Map.remove(key, value) which is specific to Java 8.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/3a90dbbd
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/3a90dbbd
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/3a90dbbd
Branch: refs/heads/master
Commit: 3a90dbbd0011416d7116da7a901c215f1186a682
Parents: 1c012f4
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Feb 1 13:01:43 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Feb 1 13:01:43 2018 -0800
----------------------------------------------------------------------
.../auth/jdbc/base/ArbitraryAttributeMap.java | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/3a90dbbd/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
index 61a7ff7..219abe8 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
@@ -83,10 +83,22 @@ public class ArbitraryAttributeMap extends HashMap<String, String> {
if (!(o instanceof ArbitraryAttributeModel))
return false;
- // The attribute should be removed only if the value matches
+ // Remove only if key is actually present
ArbitraryAttributeModel model = (ArbitraryAttributeModel) o;
- return ArbitraryAttributeMap.this.remove(model.getName(),
- model.getValue());
+ if (!ArbitraryAttributeMap.this.containsKey(model.getName()))
+ return false;
+
+ // The attribute should be removed only if the value matches
+ String currentValue = ArbitraryAttributeMap.this.get(model.getName());
+ if (currentValue == null) {
+ if (model.getValue() != null)
+ return false;
+ }
+ else if (!currentValue.equals(model.getValue()))
+ return false;
+
+ ArbitraryAttributeMap.this.remove(model.getName());
+ return true;
}
[2/4] guacamole-client git commit: GUACAMOLE-96: Implement
Iterator.remove() within ArbitraryAttributeMap's iterator.
Posted by vn...@apache.org.
GUACAMOLE-96: Implement Iterator.remove() within ArbitraryAttributeMap's iterator.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/1c012f4e
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/1c012f4e
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/1c012f4e
Branch: refs/heads/master
Commit: 1c012f4ed0c780cd2418a26efefbdddcc42f11c3
Parents: 4a78575
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Feb 1 12:43:24 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Feb 1 12:43:24 2018 -0800
----------------------------------------------------------------------
.../apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1c012f4e/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
index 797965a..61a7ff7 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
@@ -148,6 +148,11 @@ public class ArbitraryAttributeMap extends HashMap<String, String> {
entry.getValue());
}
+ @Override
+ public void remove() {
+ iterator.remove();
+ }
+
};
}