Author: fanningpj
Date: Fri Aug 19 00:26:38 2022
New Revision: 1903546
URL: http://svn.apache.org/viewvc?rev=1903546&view=rev
Log:
some int narrowing
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/PushedInputStream.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLBeansConstants.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java?rev=1903546&r1=1903545&r2=1903546&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDateBuilder.java Fri Aug
19 00:26:38 2022
@@ -683,7 +683,7 @@ public final class GDateBuilder implemen
}
if (hasDay()) {
- _D += carry;
+ _D = Math.addExact(_D, Math.toIntExact(carry));
}
if (hasDate()) {
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java?rev=1903546&r1=1903545&r2=1903546&view=diff
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java
(original)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/GDurationBuilder.java Fri
Aug 19 00:26:38 2022
@@ -339,7 +339,7 @@ public class GDurationBuilder implements
temp = _M;
long ycarry = _fQuotient(temp, 12);
_M = _mod(temp, 12, ycarry);
- _CY += ycarry;
+ _CY = Math.addExact(_CY, Math.toIntExact(ycarry));
}
long carry = 0;
@@ -366,7 +366,7 @@ public class GDurationBuilder implements
temp = _h + carry;
carry = _fQuotient(temp, 24);
_h = _mod(temp, 24, carry);
- _D += carry;
+ _D = Math.addExact(_D, Math.toIntExact(carry));
}
if (_CY == 0 && _M == 0 && _D == 0 && _h == 0 && _m == 0 && _s == 0 &&
(_fs == null || _fs.signum() == 0)) {
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/PushedInputStream.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/PushedInputStream.java?rev=1903546&r1=1903545&r2=1903546&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/PushedInputStream.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/PushedInputStream.java
Fri Aug 19 00:26:38 2022
@@ -152,7 +152,7 @@ public abstract class PushedInputStream
}
long skipped = (avail < n) ? avail : n;
- readpos += skipped;
+ readpos = Math.addExact(readpos, Math.toIntExact(skipped));
return skipped;
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLBeansConstants.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLBeansConstants.java?rev=1903546&r1=1903545&r2=1903546&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLBeansConstants.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLBeansConstants.java
Fri Aug 19 00:26:38 2022
@@ -15,8 +15,6 @@
package org.apache.xmlbeans.impl.common;
-import org.apache.xmlbeans.XmlOptions;
-
public class XMLBeansConstants {
public static final String ENTITY_EXPANSION_LIMIT =
"http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit";;
public static final String SECURITY_MANAGER =
"http://apache.org/xml/properties/security-manager";;
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
URL:
http://svn.apache.org/viewvc/xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java?rev=1903546&r1=1903545&r2=1903546&view=diff
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
(original)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeSystemImpl.java
Fri Aug 19 00:26:38 2022
@@ -551,27 +551,25 @@ public class SchemaTypeSystemImpl extend
*/
private static synchronized void nextBytes(byte[] result) {
if (_random == null) {
- try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- LongUTFDataOutputStream daos = new
LongUTFDataOutputStream(baos);
-
- // at least 10 bits of unqieueness, right? Maybe even 50 or
60.
-
daos.writeInt(System.identityHashCode(SchemaTypeSystemImpl.class));
- String[] props = new String[]{"user.name", "user.dir",
"user.timezone", "user.country", "java.class.path", "java.home", "java.vendor",
"java.version", "os.version"};
- for (String s : props) {
- String prop = SystemProperties.getProperty(s);
- if (prop != null) {
- daos.writeUTF(prop);
- daos.writeInt(System.identityHashCode(prop));
+ try (ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+ try (LongUTFDataOutputStream daos = new
LongUTFDataOutputStream(baos)) {
+ // at least 10 bits of unqieueness, right? Maybe even 50
or 60.
+
daos.writeInt(System.identityHashCode(SchemaTypeSystemImpl.class));
+ String[] props = new String[]{"user.name", "user.dir",
"user.timezone", "user.country", "java.class.path", "java.home", "java.vendor",
"java.version", "os.version"};
+ for (String s : props) {
+ String prop = SystemProperties.getProperty(s);
+ if (prop != null) {
+ daos.writeUTF(prop);
+ daos.writeInt(System.identityHashCode(prop));
+ }
}
+ daos.writeLong(Runtime.getRuntime().freeMemory());
}
- daos.writeLong(Runtime.getRuntime().freeMemory());
- daos.close();
byte[] bytes = baos.toByteArray();
for (int i = 0; i < bytes.length; i++) {
int j = i % _mask.length;
- _mask[j] *= 21;
- _mask[j] += i;
+ _mask[j] *= (byte) 21;
+ _mask[j] += (byte) i;
}
} catch (IOException e) {
XBeanDebug.LOG.atDebug().withThrowable(e).log(e.getMessage());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
