diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-04-10 09:35:19 -0500 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-10 16:25:32 +0100 |
| commit | acd3b6e624d7e853374c1e9c7b894a8eb1a6f8e4 (patch) | |
| tree | 0b836be939e8c4f48c7c0063bc49f7d5baecf876 | |
| parent | f6789641af5e1c7ecd4a65ea5deb020c5d3367e5 (diff) | |
workaround IBM java 1.5.0 inconvertible types error
Change-Id: I84533723e9f42a27e2942c28b53232630db82e10
| -rw-r--r-- | jurt/com/sun/star/lib/uno/environments/java/java_environment.java | 3 | ||||
| -rw-r--r-- | ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java index 1fdfdf9e3d9b..522ca8c2408b 100644 --- a/jurt/com/sun/star/lib/uno/environments/java/java_environment.java +++ b/jurt/com/sun/star/lib/uno/environments/java/java_environment.java @@ -206,7 +206,8 @@ public final class java_environment implements IEnvironment { // must only be called while synchronized on this Registry: private void cleanUp() { for (;;) { - Level2Entry l2 = (Level2Entry) queue.poll(); + Object tmp = queue.poll(); + Level2Entry l2 = (Level2Entry) tmp; if (l2 == null) { break; } diff --git a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java index f532133299d2..7f1efcfbcf8c 100644 --- a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java +++ b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java @@ -676,7 +676,8 @@ public final class TypeDescription implements ITypeDescription { private void cleanUp() { for (;;) { - Entry e = (Entry) queue.poll(); + Object tmp = queue.poll(); + Entry e = (Entry)tmp; if (e == null) { break; } |