From 62cde572ed121b53008977d569949c0dab95eb41 Mon Sep 17 00:00:00 2001 From: Eric Caspole Date: Thu, 11 Sep 2025 16:44:22 -0400 Subject: [PATCH 1/2] Change synch locks from Integer to Object --- .../java/org/apache/xml/serializer/OutputPropertiesFactory.java | 2 +- .../main/java/org/apache/xalan/transformer/TransformerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/serializer/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java b/serializer/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java index 65ef5a5b0..fc7c98e52 100644 --- a/serializer/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java +++ b/serializer/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java @@ -183,7 +183,7 @@ public final class OutputPropertiesFactory private static final int S_XALAN_PREFIX_LEN = S_XALAN_PREFIX.length(); /** Synchronization object for lazy initialization of the above tables. */ - private static Integer m_synch_object = new Integer(1); + private static final Object m_synch_object = new Object(); /** the directory in which the various method property files are located */ private static final String PROP_DIR = SerializerBase.PKG_PATH+'/'; diff --git a/xalan/src/main/java/org/apache/xalan/transformer/TransformerImpl.java b/xalan/src/main/java/org/apache/xalan/transformer/TransformerImpl.java index 62241afcc..24772f848 100644 --- a/xalan/src/main/java/org/apache/xalan/transformer/TransformerImpl.java +++ b/xalan/src/main/java/org/apache/xalan/transformer/TransformerImpl.java @@ -112,7 +112,7 @@ public class TransformerImpl extends Transformer // or reentry while the transform is going on. /** NEEDSDOC Field m_reentryGuard */ - private Boolean m_reentryGuard = new Boolean(true); + private final Object m_reentryGuard = new Object(); /** * This is null unless we own the stream. From c397184e178c3df6379634594f9c833debeef367 Mon Sep 17 00:00:00 2001 From: Eric Caspole Date: Wed, 17 Sep 2025 13:05:57 -0400 Subject: [PATCH 2/2] Remove final I added while testing --- .../java/org/apache/xml/serializer/OutputPropertiesFactory.java | 2 +- .../main/java/org/apache/xalan/transformer/TransformerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/serializer/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java b/serializer/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java index fc7c98e52..2f4d17190 100644 --- a/serializer/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java +++ b/serializer/src/main/java/org/apache/xml/serializer/OutputPropertiesFactory.java @@ -183,7 +183,7 @@ public final class OutputPropertiesFactory private static final int S_XALAN_PREFIX_LEN = S_XALAN_PREFIX.length(); /** Synchronization object for lazy initialization of the above tables. */ - private static final Object m_synch_object = new Object(); + private static Object m_synch_object = new Object(); /** the directory in which the various method property files are located */ private static final String PROP_DIR = SerializerBase.PKG_PATH+'/'; diff --git a/xalan/src/main/java/org/apache/xalan/transformer/TransformerImpl.java b/xalan/src/main/java/org/apache/xalan/transformer/TransformerImpl.java index 24772f848..5c569b72d 100644 --- a/xalan/src/main/java/org/apache/xalan/transformer/TransformerImpl.java +++ b/xalan/src/main/java/org/apache/xalan/transformer/TransformerImpl.java @@ -112,7 +112,7 @@ public class TransformerImpl extends Transformer // or reentry while the transform is going on. /** NEEDSDOC Field m_reentryGuard */ - private final Object m_reentryGuard = new Object(); + private Object m_reentryGuard = new Object(); /** * This is null unless we own the stream.