From d1352c99e8d01f3d05dc41731d81413dbd973c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Fri, 20 Aug 2004 08:22:47 +0000
Subject: [PATCH] INTEGRATION: CWS sb21 (1.15.18); FILE MERGED 2004/08/03
 09:34:29 sb 1.15.18.1: #i32130# Made com.sun.star.lib.uno.protocols.urp.Cache
 work as expected.

---
 jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java b/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java
index 08eab816418a..09274407c170 100644
--- a/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java
+++ b/jurt/com/sun/star/lib/uno/protocols/urp/Marshal.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Marshal.java,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: obo $ $Date: 2004-06-03 14:35:15 $
+ *  last change: $Author: rt $ $Date: 2004-08-20 09:22:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,7 +108,7 @@ final class Marshal {
             write16Bit(0xFFFF);
         } else {
             boolean[] found = new boolean[1];
-            short index = objectIdCache.add(found, objectId);
+            int index = objectIdCache.add(found, objectId);
             writeStringValue(found[0] ? null : objectId);
             write16Bit(index);
         }
@@ -117,7 +117,7 @@ final class Marshal {
     public void writeThreadId(ThreadId threadId) {
         byte[] data = threadId.getBytes();
         boolean[] found = new boolean[1];
-        short index = threadIdCache.add(found, data);
+        int index = threadIdCache.add(found, data);
         if (found[0]) {
             writeCompressedNumber(0);
         } else {
@@ -133,7 +133,7 @@ final class Marshal {
             write8Bit(typeClass.getValue());
         } else {
             boolean[] found = new boolean[1];
-            short index = typeCache.add(found, type.getTypeName());
+            int index = typeCache.add(found, type.getTypeName());
             write8Bit(typeClass.getValue() | (found[0] ? 0 : 0x80));
             write16Bit(index);
             if (!found[0]) {