Skip to content
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

Jump to bottom

[master] ConcurrencyManager dead-lock detection diagnostic improvement 2.0.2 #1246

Merged
merged 1 commit into from
Aug 23, 2021
Merged

[master] ConcurrencyManager dead-lock detection diagnostic improvement 2.0.2 #1246

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rsistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConcurrencyUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ public String createToStringExplainingOwnedCacheKey(ConcurrencyManager concurren
String canonicalName = cacheKeyObject != null ? cacheKeyObject.getClass().getCanonicalName()
: TraceLocalization.buildMessage("concurrency_util_owned_cache_key_null");
return TraceLocalization.buildMessage("concurrency_util_owned_cache_key_is_cache_key", new Object[] {canonicalName, primaryKey,
cacheKeyObject, String.valueOf(System.identityHashCode(cacheKeyObject)),
String.valueOf(System.identityHashCode(cacheKeyObject)),
cacheKeyClass, String.valueOf(System.identityHashCode(cacheKey)),
activeThread, concurrencyManager.getNumberOfReaders(), concurrencyManagerId,
ConversionManager.getDefaultManager().convertObject(concurrencyManagerCreationDate, String.class).toString()
Expand Down
12 changes: 6 additions & 6 deletions ...in/java/org/eclipse/persistence/internal/localization/i18n/TraceLocalizationResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,12 @@ public class TraceLocalizationResource extends ListResourceBundle {
+ " The thread has been stuck for: ({3} ms) \n "
+ " Bellow we will describe the ActiveLocks, DeferredLocks and ReadLocks for this thread. " },
{ "concurrency_util_owned_cache_key_null", "ObjectNull. Most likely not yet in server session cache and in the process of being created."},
{ "concurrency_util_owned_cache_key_is_cache_key", "--- CacheKey ({0}): (primaryKey: {1}) (object: {2}) (object hash code: {3}) (cacheKeyClass: {4}) (cacheKey hash code: {5}) (current cache key owner/activeThread: {6}) (getNumberOfReaders: {7}) "
+ " (concurrencyManagerId: {8}) (concurrencyManagerCreationDate: {9})"
+ " (totalNumberOfTimeCacheKeyAcquiredForReading: {10}) "
+ " (totalNumberOfTimeCacheKeyReleasedForReading: {11}) "
+ " (totalNumberOfTimeCacheKeyReleasedForReadingBlewUpExceptionDueToCacheKeyHavingReachedCounterZero: {12}) "
+ "(depth: {13}) ---"},
{ "concurrency_util_owned_cache_key_is_cache_key", "--- CacheKey ({0}): (primaryKey: {1}) (object hash code: {2}) (cacheKeyClass: {3}) (cacheKey hash code: {4}) (current cache key owner/activeThread: {5}) (getNumberOfReaders: {6}) "
+ " (concurrencyManagerId: {7}) (concurrencyManagerCreationDate: {8})"
+ " (totalNumberOfTimeCacheKeyAcquiredForReading: {9}) "
+ " (totalNumberOfTimeCacheKeyReleasedForReading: {10}) "
+ " (totalNumberOfTimeCacheKeyReleasedForReadingBlewUpExceptionDueToCacheKeyHavingReachedCounterZero: {11}) "
+ "(depth: {12}) ---"},
{ "concurrency_util_owned_cache_key_is_not_cache_key", "--- ConcurrencyManager: (ConcurrencyManagerClass: {0} ) (ConcurrencyManagerToString: {1}) (current cache key owner/activeThread: {2}) (concurrencyManagerId: {3}) (concurrencyManagerCreationDate: {4}) "
+ " (totalNumberOfTimeCacheKeyAcquiredForReading: {5}) "
+ " (totalNumberOfTimeCacheKeyReleasedForReading: {6}) "
Expand Down