Skip to content

Fix Save Value to File for large debugger strings (#9452) #9534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kamilkrzywanski wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −3
Open

Fix Save Value to File for large debugger strings (#9452) #9534

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/ShortenedStrings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import java.lang.ref.WeakReference;
import java.text.MessageFormat;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -73,7 +74,7 @@
*/
public final class ShortenedStrings {

private static final Map<String, StringInfo> infoStrings = new WeakHashMap<String, StringInfo>();
private static final Map<String, StringInfo> infoStrings = new HashMap<String, StringInfo>();
private static final Map<StringReference, StringValueInfo> stringsCache = new WeakHashMap<StringReference, StringValueInfo>();
private static final Set<StringReference> retrievingStrings = new HashSet<StringReference>();
private static final Map<VirtualMachine, Boolean> isLittleEndianCache =
Expand All @@ -85,7 +86,6 @@ public final class ShortenedStrings {

@Override
public void sessionRemoved(Session session) {
// Clean up. WeakHashMap does not clean up if not touched. :-(
int n = DebuggerManager.getDebuggerManager().getSessions().length;
if (n == 0) {
synchronized (infoStrings) {
Expand All @@ -107,8 +107,19 @@ public void sessionRemoved(Session session) {
private ShortenedStrings() {}

public static StringInfo getShortenedInfo(String s) {
if (s == null) {
return null;
}
synchronized (infoStrings) {
return infoStrings.get(s);
StringInfo info = infoStrings.get(s);
if (info != null) {
return info;
}
// Variable.getValue() wraps Strings in quotes: "content..."
if (s.length() >= 2 && s.charAt(0) == '"' && s.charAt(s.length() - 1) == '"') {
return infoStrings.get(s.substring(1, s.length() - 1));
}
return null;
}
}

Expand Down