Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-11-24 03:25:29 +01:00
Code Issues Projects Releases Wiki Activity

Don't cache equivalent converters in StructureModifier.

Browse Source 
This should hopefully fix a memory leak discovered by Stevenpcc 
(thanks).
This commit is contained in:
Kristian S. Stangeland 2014-06-10 23:01:24 +02:00
parent 1141c0ba71
commit 5b21f4d61c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ProtocolLib/src/main/java/com/comphenix/protocol/reflect/StructureModifier.java
View File

@ -382,7 +382,6 @@ public class StructureModifier<TField> {
*/
@SuppressWarnings("unchecked")
public <T> StructureModifier<T> withType(Class fieldType, EquivalentConverter<T> converter) {
StructureModifier<T> result = subtypeCache.get(fieldType);
// Do we need to update the cache?
@ -405,7 +404,7 @@ public class StructureModifier<TField> {
}
// Cache structure modifiers
result = withFieldType(fieldType, filtered, defaults, converter);
result = withFieldType(fieldType, filtered, defaults);
if (fieldType != null) {
subtypeCache.put(fieldType, result);
@ -423,7 +422,6 @@ public class StructureModifier<TField> {
if (!Objects.equal(result.converter, converter)) {
result = result.withConverter(converter);
}
return result;
}
@ -464,7 +462,20 @@ public class StructureModifier<TField> {
* @param fieldType - common type of each field.
* @param filtered - list of fields after filtering the original modifier.
* @param defaults - list of default values after filtering the original.
* @param converter - the new converter.
* @param converter - the new converter
* @return A new structure modifier.
*/
protected <T> StructureModifier<T> withFieldType(
Class fieldType, List<Field> filtered, Map<Field, Integer> defaults) {
return withFieldType(fieldType, filtered, defaults, null);
}
/**
* Create a new structure modifier for the new field type.
* @param fieldType - common type of each field.
* @param filtered - list of fields after filtering the original modifier.
* @param defaults - list of default values after filtering the original.
* @param converter - the new converter, or NULL.
* @return A new structure modifier.
*/
protected <T> StructureModifier<T> withFieldType(
@ -592,7 +603,6 @@ public class StructureModifier<TField> {
result.add(field);
}
}
return result;
}
}