bean/com/sun/star/comp/beans/LocalOfficeConnection.java | 2 -
connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java | 18
+++++-----
qadevOOo/runner/convwatch/SimpleFileSemaphore.java | 2 -
qadevOOo/runner/convwatch/TimeHelper.java | 2 -
qadevOOo/runner/graphical/TimeHelper.java | 2 -
qadevOOo/runner/helper/OfficeProvider.java | 2 -
qadevOOo/runner/helper/ProcessHandler.java | 2 -
7 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit e61c4b5f06241dd248cfe28b29cb658ea47bd72e
Author: Robert Antoni Buj i Gelonch <robert....@gmail.com>
Date: Thu Oct 16 18:58:13 2014 +0200
java: prevent overflow by using 'long int' arithmetic in multiplication
Change-Id: I8dda8f4621f265208c713c9edcfe725f1c9c5998
Reviewed-on: https://gerrit.libreoffice.org/12001
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
index da86510..7174dca 100644
--- a/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeConnection.java
@@ -318,7 +318,7 @@ public class LocalOfficeConnection
aSOffice.startupService();
// wait until soffice is started
- long nMaxMillis = System.currentTimeMillis() +
1000*aSOffice.getStartupTime();
+ long nMaxMillis = System.currentTimeMillis() +
1000L*aSOffice.getStartupTime();
while ( aInitialObject == null )
{
try
diff --git a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
index 57ce3f9..ecca4fd 100644
--- a/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
+++ b/connectivity/qa/complex/connectivity/hsqldb/TestCacheSize.java
@@ -335,7 +335,7 @@ public class TestCacheSize {
System.out.println("Total insert: " + i);
System.out.println("Insert time: " + sw.elapsedTime() + " rps: "
- + (i * 1000 / (sw.elapsedTime() + 1)));
+ + (1000L * i / (sw.elapsedTime() + 1)));
}
private void fillUpMultiTable(String filler,
@@ -388,7 +388,7 @@ public class TestCacheSize {
System.out.println("Multi Key Total insert: " + i);
System.out.println("Insert time: " + sw.elapsedTime() + " rps: "
- + (i * 1000 / (sw.elapsedTime() + 1)));
+ + (1000L * i / (sw.elapsedTime() + 1)));
}
public void tearDown() {}
@@ -478,7 +478,7 @@ public class TestCacheSize {
|| (slow && (i + 1) % 100 == 0)) {
System.out.println("Select " + (i + 1) + " : "
+ sw.elapsedTime() + " rps: "
- + (i * 1000 / (sw.elapsedTime() + 1)));
+ + (1000L * i / (sw.elapsedTime() + 1)));
}
}
} catch (SQLException e) {
@@ -487,7 +487,7 @@ public class TestCacheSize {
System.out.println("Select random zip " + i + " rows : "
+ sw.elapsedTime() + " rps: "
- + (i * 1000 / (sw.elapsedTime() + 1)));
+ + (1000L * i / (sw.elapsedTime() + 1)));
sw.zero();
try {
@@ -511,7 +511,7 @@ public class TestCacheSize {
System.out.println("Select random id " + i + " rows : "
+ sw.elapsedTime() + " rps: "
- + (i * 1000 / (sw.elapsedTime() + 1)));
+ + (1000L * i / (sw.elapsedTime() + 1)));
sw.zero();
try {
@@ -535,7 +535,7 @@ public class TestCacheSize {
System.out.println("Select random zip from zip table " + i
+ " rows : " + sw.elapsedTime() + " rps: "
- + (i * 1000 / (sw.elapsedTime() + 1)));
+ + (1000L * i / (sw.elapsedTime() + 1)));
}
private void checkUpdates() {
@@ -570,7 +570,7 @@ public class TestCacheSize {
System.out.println("Update with random zip " + i
+ " UPDATE commands, " + count + " rows : "
+ sw.elapsedTime() + " rps: "
- + (count * 1000 / (sw.elapsedTime() + 1)));
+ + (1000L * count / (sw.elapsedTime() + 1)));
sw.zero();
try {
@@ -588,7 +588,7 @@ public class TestCacheSize {
|| (slow && (i + 1) % 100 == 0)) {
System.out.println("Update " + (i + 1) + " : "
+ sw.elapsedTime() + " rps: "
- + (i * 1000 / (sw.elapsedTime() + 1)));
+ + (1000L * i / (sw.elapsedTime() + 1)));
}
}
} catch (SQLException e) {
@@ -597,6 +597,6 @@ public class TestCacheSize {
System.out.println("Update with random id " + i + " rows : "
+ sw.elapsedTime() + " rps: "
- + (i * 1000 / (sw.elapsedTime() + 1)));
+ + (1000L * i / (sw.elapsedTime() + 1)));
}
}
diff --git a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java
b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java
index 02c965c..7f1864f 100644
--- a/qadevOOo/runner/convwatch/SimpleFileSemaphore.java
+++ b/qadevOOo/runner/convwatch/SimpleFileSemaphore.java
@@ -33,7 +33,7 @@ public class SimpleFileSemaphore /* extends *//* implements */
// wait a second here
try
{
- java.lang.Thread.sleep(_nSeconds * 1000);
+ java.lang.Thread.sleep(1000L * _nSeconds);
}
catch (InterruptedException e2)
{
diff --git a/qadevOOo/runner/convwatch/TimeHelper.java
b/qadevOOo/runner/convwatch/TimeHelper.java
index abb68b7..8d5d792 100644
--- a/qadevOOo/runner/convwatch/TimeHelper.java
+++ b/qadevOOo/runner/convwatch/TimeHelper.java
@@ -29,7 +29,7 @@ public class TimeHelper
{
GlobalLogWriter.get().println("Wait " + _nSeconds + " sec. Reason:
" + _sReason);
try {
- java.lang.Thread.sleep(_nSeconds * 1000);
+ java.lang.Thread.sleep(1000L * _nSeconds);
} catch (InterruptedException e2) {}
}
}
diff --git a/qadevOOo/runner/graphical/TimeHelper.java
b/qadevOOo/runner/graphical/TimeHelper.java
index 6b885bb..7280982 100644
--- a/qadevOOo/runner/graphical/TimeHelper.java
+++ b/qadevOOo/runner/graphical/TimeHelper.java
@@ -31,7 +31,7 @@ public class TimeHelper
{
GlobalLogWriter.println("Wait 0.25 * " + _nSeconds + " sec.
Reason: " + _sReason);
try {
- java.lang.Thread.sleep(_nSeconds * 250);
+ java.lang.Thread.sleep(250L * _nSeconds);
} catch (InterruptedException e2) {}
}
diff --git a/qadevOOo/runner/helper/OfficeProvider.java
b/qadevOOo/runner/helper/OfficeProvider.java
index cfb2e232..4be6c27 100644
--- a/qadevOOo/runner/helper/OfficeProvider.java
+++ b/qadevOOo/runner/helper/OfficeProvider.java
@@ -264,7 +264,7 @@ public class OfficeProvider implements AppProvider
{
try
{
- Thread.sleep(k * 500);
+ Thread.sleep(500L * k);
}
catch (InterruptedException ex)
{
diff --git a/qadevOOo/runner/helper/ProcessHandler.java
b/qadevOOo/runner/helper/ProcessHandler.java
index 2554d16..fb3ff77 100644
--- a/qadevOOo/runner/helper/ProcessHandler.java
+++ b/qadevOOo/runner/helper/ProcessHandler.java
@@ -446,7 +446,7 @@ public class ProcessHandler
try
{
- Thread.sleep(1000 * counter); // 5000
+ Thread.sleep(1000L * counter); // 5000
}
catch (InterruptedException e)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
