safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-96: Merge restore compatibility with 1.7 JDK.

Browse Source
This commit is contained in:
Nick Couchman
2018-02-01 23:10:55 -05:00
parent 07d0307855 3a90dbbd00
commit 798349e231
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/base/ArbitraryAttributeMap.java
View File

@@ -23,6 +23,7 @@ import java.util.AbstractCollection;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map;
/** /**
* Map of arbitrary attribute name/value pairs which can alternatively be * Map of arbitrary attribute name/value pairs which can alternatively be
@@ -82,10 +83,22 @@ public class ArbitraryAttributeMap extends HashMap<String, String> {
if (!(o instanceof ArbitraryAttributeModel)) if (!(o instanceof ArbitraryAttributeModel))
return false; return false;
// The attribute should be removed only if the value matches // Remove only if key is actually present
ArbitraryAttributeModel model = (ArbitraryAttributeModel) o; ArbitraryAttributeModel model = (ArbitraryAttributeModel) o;
return ArbitraryAttributeMap.this.remove(model.getName(), if (!ArbitraryAttributeMap.this.containsKey(model.getName()))
model.getValue()); 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;
} }
@@ -129,7 +142,7 @@ public class ArbitraryAttributeMap extends HashMap<String, String> {
public Iterator<ArbitraryAttributeModel> iterator() { public Iterator<ArbitraryAttributeModel> iterator() {
// Get iterator over all string name/value entries // 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 // Dynamically translate each string name/value entry into a
// corresponding attribute model object as iteration continues // corresponding attribute model object as iteration continues
@@ -142,11 +155,16 @@ public class ArbitraryAttributeMap extends HashMap<String, String> {
@Override @Override
public ArbitraryAttributeModel next() { public ArbitraryAttributeModel next() {
Entry<String, String> entry = iterator.next(); Map.Entry<String, String> entry = iterator.next();
return new ArbitraryAttributeModel(entry.getKey(), return new ArbitraryAttributeModel(entry.getKey(),
entry.getValue()); entry.getValue());
} }
@Override
public void remove() {
iterator.remove();
}
}; };
} }