[Libreoffice-commits] core.git: jurt/com qadevOOo/tests

[jan iversen]

 jurt/com/sun/star/lib/uno/protocols/urp/urp.java            |    4 +++-
 qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java |    7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit e39bf3677109976cae13e1bdff044e2d5769c098
Author: jan iversen <j...@documentfoundation.org>
Date:   Thu Jan 21 19:54:46 2016 +0100

    cid#1326191, 1326202
    
    Null references elements, introduced throw
    
    Change-Id: I22bf7de5f20c3ca455df31de2a5d7301b436ed82
    Reviewed-on: https://gerrit.libreoffice.org/21691
    Reviewed-by: Noel Grandin <noelgran...@gmail.com>
    Tested-by: Noel Grandin <noelgran...@gmail.com>

diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/urp.java 
b/jurt/com/sun/star/lib/uno/protocols/urp/urp.java
index 5e7b328..cea15db 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/urp.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/urp.java
@@ -619,8 +619,10 @@ public final class urp implements IProtocol {
         for (int i = releaseQueue.size(); i > 0;) {
             --i;
             QueuedRelease r = releaseQueue.get(i);
+            if (r == null)
+              throw new IOException("releaseQueue unexpected empty");
             writeRequest(
-                r.internal, r.objectId, r.type, r.method, r.threadId, null,
+                 r.internal, r.objectId, r.type, r.method, r.threadId, null,
                 false);
             releaseQueue.remove(i);
         }
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java 
b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
index 9f4f5c0..92082d3 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleText.java
@@ -475,8 +475,15 @@ public class _XAccessibleText extends MultiMethodTest {
             } catch (com.sun.star.lang.IllegalArgumentException e) {
             }
 
+            if (aRect == null) {
+                res = false;
+                log.print("aRect unexpected null");
+                break;
+            }
+
             int x = aRect.X + (aRect.Width / 2);
             int y = aRect.Y + (aRect.Height / 2);
+
             Point aPoint = new Point(x, y);
             int nIndex = oObj.getIndexAtPoint(aPoint);
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits