PatchesAndForks/rome
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #309 from mishako/tostring-bean-threadlocal-cleanup

Browse source 
Clean up threadlocal after usage
This commit is contained in:
Patrick Gotthard 2016-07-18 09:42:24 +02:00 committed by GitHub
commit acd0911c4d
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
rome/src/main/java/com/rometools/rome/feed/impl/ToStringBean.java
View file

@ -41,17 +41,7 @@ public class ToStringBean implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Logger LOG = LoggerFactory.getLogger(ToStringBean.class); private static final Logger LOG = LoggerFactory.getLogger(ToStringBean.class);
private static final ThreadLocal<Stack<String[]>> PREFIX_TL = new ThreadLocal<Stack<String[]>>() { private static final ThreadLocal<Stack<String[]>> PREFIX_TL = new ThreadLocal<Stack<String[]>>();
@Override
public Stack<String[]> get() {
Stack<String[]> o = super.get();
if (o == null) {
o = new Stack<String[]>();
set(o);
}
return o;
}
};
private static final Object[] NO_PARAMS = new Object[0]; private static final Object[] NO_PARAMS = new Object[0];
@ -113,7 +103,15 @@ public class ToStringBean implements Serializable {
*/ */
@Override @Override
public String toString() { public String toString() {
final Stack<String[]> stack = PREFIX_TL.get(); Stack<String[]> stack = PREFIX_TL.get();
boolean needStackCleanup = false;
if (stack == null) {
stack = new Stack<String[]>();
PREFIX_TL.set(stack);
needStackCleanup = true;
}
final String[] tsInfo; final String[] tsInfo;
if (stack.isEmpty()) { if (stack.isEmpty()) {
tsInfo = null; tsInfo = null;
@ -128,7 +126,14 @@ public class ToStringBean implements Serializable {
prefix = tsInfo[0]; prefix = tsInfo[0];
tsInfo[1] = prefix; tsInfo[1] = prefix;
} }
return this.toString(prefix);
final String result = toString(prefix);
if (needStackCleanup) {
PREFIX_TL.remove();
}
return result;
} }
/** /**