summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/CommunicatorI.java5
-rw-r--r--java/src/Ice/Object.java8
-rw-r--r--java/src/Ice/UserException.java4
-rw-r--r--java/src/IceInternal/Collector.java31
-rw-r--r--java/src/IceInternal/CollectorFactory.java4
-rw-r--r--java/src/IceInternal/Endpoint.java4
-rw-r--r--java/src/IceInternal/EventHandler.java8
-rw-r--r--java/src/IceInternal/Incoming.java14
-rw-r--r--java/src/IceInternal/Outgoing.java14
-rw-r--r--java/src/IceInternal/Reference.java4
-rw-r--r--java/src/IceInternal/TcpEndpoint.java4
-rw-r--r--java/src/IceInternal/TraceUtil.java10
-rw-r--r--java/src/IceInternal/UdpEndpoint.java4
-rw-r--r--java/src/IceInternal/UnknownEndpoint.java4
14 files changed, 57 insertions, 61 deletions
diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index 7abe1790fa4..fb1c420b260 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -174,6 +174,7 @@ class CommunicatorI implements Communicator
_instance.logger(logger);
}
+ /*
public Stream
createStream()
{
@@ -182,8 +183,10 @@ class CommunicatorI implements Communicator
throw new CommunicatorDestroyedException();
}
- return new StreamI(_instance);
+ // TODO
+ return null;
}
+ */
CommunicatorI(Properties propertites)
{
diff --git a/java/src/Ice/Object.java b/java/src/Ice/Object.java
index 55718b206d6..963e8841114 100644
--- a/java/src/Ice/Object.java
+++ b/java/src/Ice/Object.java
@@ -39,8 +39,8 @@ public abstract class Object
public final IceInternal.DispatchStatus
___ice_isA(IceInternal.Incoming __in)
{
- Stream __is = __in.is();
- Stream __os = __in.os();
+ IceInternal.BasicStream __is = __in.is();
+ IceInternal.BasicStream __os = __in.os();
String s = __is.readString();
boolean __ret = ice_isA(s);
__os.writeBool(__ret);
@@ -99,7 +99,7 @@ public abstract class Object
}
public void
- __write(Stream __os)
+ __write(IceInternal.BasicStream __os)
{
synchronized(_activeFacetMapMutex)
{
@@ -118,7 +118,7 @@ public abstract class Object
}
public void
- __read(Stream __is)
+ __read(IceInternal.BasicStream __is)
{
synchronized(_activeFacetMapMutex)
{
diff --git a/java/src/Ice/UserException.java b/java/src/Ice/UserException.java
index ad98d010c7e..8695c75654f 100644
--- a/java/src/Ice/UserException.java
+++ b/java/src/Ice/UserException.java
@@ -19,8 +19,8 @@ public abstract class UserException extends Exception
__getExceptionIds();
public abstract void
- __write(Stream out);
+ __write(IceInternal.BasicStream out);
public abstract void
- __read(Stream out);
+ __read(IceInternal.BasicStream out);
}
diff --git a/java/src/IceInternal/Collector.java b/java/src/IceInternal/Collector.java
index d59944b5aae..bb155f1a3ff 100644
--- a/java/src/IceInternal/Collector.java
+++ b/java/src/IceInternal/Collector.java
@@ -84,16 +84,16 @@ public class Collector extends EventHandler
}
public void
- read(Ice.Stream is)
+ read(BasicStream is)
{
_transceiver.read(is, 0);
}
public void
- message(Ice.Stream stream)
+ message(BasicStream stream)
{
Incoming in = new Incoming(_instance, _adapter);
- Stream os = in.os();
+ BasicStream os = in.os();
boolean invoke = false;
boolean batch = false;
boolean response = false;
@@ -110,11 +110,10 @@ public class Collector extends EventHandler
try
{
- // assert(stream.i == stream.b.end()); TODO
- // stream.i = stream.b.begin() + 2;
- // Byte messageType;
- // stream.read(messageType);
- // stream.i = stream.b.begin() + headerSize;
+ assert(stream.pos() == stream.size());
+ stream.pos(2);
+ byte messageType = stream.readByte();
+ stream.pos(Protocol.headerSize);
//
// Write partial message header
@@ -268,19 +267,13 @@ public class Collector extends EventHandler
try
{
- // TODO
-/*
- os.i = os.b.begin();
+ os.pos(3);
//
// Fill in the message size
//
- const Byte* p;
- Int sz = os.b.size();
- p = reinterpret_cast<Byte*>(&sz);
- copy(p, p + sizeof(Int), os->i + 3);
-*/
-
+ os.writeInt(os.size());
+
TraceUtil.traceReply("sending reply", os, _logger,
_traceLevels);
_transceiver.write(os, _endpoint.timeout());
@@ -521,12 +514,12 @@ public class Collector extends EventHandler
private void
closeConection()
{
- Stream os = new StreamI(_instance);
+ BasicStream os = new BasicStream(_instance);
os.writeByte(Protocol.protocolVersion);
os.writeByte(Protocol.encodingVersion);
os.writeByte(Protocol.closeConnectionMsg);
os.writeByte(Protocol.headerSize); // Message size
- //os.i = os.b.begin(); // TODO
+ os.pos(0);
TraceUtil.traceHeader("sending close connection", os, _logger,
_traceLevels);
_transceiver.write(os, _endpoint.timeout());
diff --git a/java/src/IceInternal/CollectorFactory.java b/java/src/IceInternal/CollectorFactory.java
index d21cfb4a164..1c47ba40848 100644
--- a/java/src/IceInternal/CollectorFactory.java
+++ b/java/src/IceInternal/CollectorFactory.java
@@ -64,13 +64,13 @@ public class CollectorFactory extends EventHandler
}
public void
- read(Ice.Stream is)
+ read(BasicStream is)
{
assert(false); // Must not be called
}
public synchronized void
- message(Ice.Stream stream)
+ message(BasicStream stream)
{
_threadPool.promoteFollower();
diff --git a/java/src/IceInternal/Endpoint.java b/java/src/IceInternal/Endpoint.java
index ed2acf81c65..6346decfe2f 100644
--- a/java/src/IceInternal/Endpoint.java
+++ b/java/src/IceInternal/Endpoint.java
@@ -64,7 +64,7 @@ public abstract class Endpoint
// Unmarshal an endpoint
//
public static Endpoint
- streamRead(Ice.Stream s)
+ streamRead(BasicStream s)
{
Endpoint v;
short type = s.readShort();
@@ -104,7 +104,7 @@ public abstract class Endpoint
//
// Marshal the endpoint
//
- public abstract void streamWrite(Ice.Stream s);
+ public abstract void streamWrite(BasicStream s);
//
// Convert the endpoint to its string form
diff --git a/java/src/IceInternal/EventHandler.java b/java/src/IceInternal/EventHandler.java
index 296f614bb8e..80a8594cb56 100644
--- a/java/src/IceInternal/EventHandler.java
+++ b/java/src/IceInternal/EventHandler.java
@@ -27,12 +27,12 @@ abstract class EventHandler
// Read data via the event handler. May only be called if
// readable() returns true.
//
- abstract void read(Ice.Stream is);
+ abstract void read(BasicStream is);
//
// A complete message has been received.
//
- abstract void message(Ice.Stream stream);
+ abstract void message(BasicStream stream);
//
// Signal exception during reading or unmarshaling.
@@ -57,7 +57,7 @@ abstract class EventHandler
EventHandler(Instance instance)
{
_instance = instance;
- _stream = new StreamI(instance);
+ _stream = new BasicStream(instance);
}
protected Instance _instance;
@@ -65,5 +65,5 @@ abstract class EventHandler
//
// The _stream data member is for use by ThreadPool only
//
- Ice.Stream _stream;
+ BasicStream _stream;
}
diff --git a/java/src/IceInternal/Incoming.java b/java/src/IceInternal/Incoming.java
index d03aac11f91..39874ef33e2 100644
--- a/java/src/IceInternal/Incoming.java
+++ b/java/src/IceInternal/Incoming.java
@@ -16,12 +16,12 @@ public final class Incoming
Incoming(Instance instance, Ice.ObjectAdapter adapter)
{
_adapter = adapter;
- _is = new StreamI(instance);
- _os = new StreamI(instance);
+ _is = new BasicStream(instance);
+ _os = new BasicStream(instance);
}
public void
- invoke(Stream is)
+ invoke(BasicStream is)
{
_is.swap(is);
String identity = _is.readString();
@@ -147,13 +147,13 @@ public final class Incoming
}
}
- public Stream
+ public BasicStream
is()
{
return _is;
}
- public Stream
+ public BasicStream
os()
{
return _os;
@@ -161,6 +161,6 @@ public final class Incoming
private Ice.ObjectAdapter _adapter;
- private Stream _is;
- private Stream _os;
+ private BasicStream _is;
+ private BasicStream _os;
}
diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java
index 097b423df92..5599d549266 100644
--- a/java/src/IceInternal/Outgoing.java
+++ b/java/src/IceInternal/Outgoing.java
@@ -18,8 +18,8 @@ public final class Outgoing
_emitter = emitter;
_reference = ref;
_state = StateUnsent;
- _is = new StreamI(ref.instance);
- _os = new StreamI(ref.instance);
+ _is = new BasicStream(ref.instance);
+ _os = new BasicStream(ref.instance);
switch (_reference.mode)
{
@@ -166,7 +166,7 @@ public final class Outgoing
}
public synchronized void
- finished(Ice.Stream is)
+ finished(BasicStream is)
{
assert(_state != StateUnsent);
if (_state == StateInProgress)
@@ -258,13 +258,13 @@ public final class Outgoing
}
}
- public Ice.Stream
+ public BasicStream
is()
{
return _is;
}
- public Ice.Stream
+ public BasicStream
os()
{
return _os;
@@ -282,6 +282,6 @@ public final class Outgoing
private static final int StateLocalException = 5;
private int _state;
- private Ice.Stream _is;
- private Ice.Stream _os;
+ private BasicStream _is;
+ private BasicStream _os;
}
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 6dce84c8017..74b0f0a0598 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -230,7 +230,7 @@ public final class Reference
}
public
- Reference(String ident, Ice.Stream s)
+ Reference(String ident, BasicStream s)
{
instance = s.instance();
identity = ident;
@@ -325,7 +325,7 @@ public final class Reference
// Marshal the reference
//
public void
- streamWrite(Ice.Stream s)
+ streamWrite(BasicStream s)
{
//
// Don't write the identity here. Operations calling streamWrite
diff --git a/java/src/IceInternal/TcpEndpoint.java b/java/src/IceInternal/TcpEndpoint.java
index 9ff2c68f1ed..dd74fccfa15 100644
--- a/java/src/IceInternal/TcpEndpoint.java
+++ b/java/src/IceInternal/TcpEndpoint.java
@@ -110,7 +110,7 @@ public final class TcpEndpoint extends Endpoint
}
public
- TcpEndpoint(Ice.Stream s)
+ TcpEndpoint(BasicStream s)
{
s.startReadEncaps();
_host = s.readString();
@@ -123,7 +123,7 @@ public final class TcpEndpoint extends Endpoint
// Marshal the endpoint
//
public void
- streamWrite(Ice.Stream s)
+ streamWrite(BasicStream s)
{
s.writeShort(TcpEndpointType);
s.startWriteEncaps();
diff --git a/java/src/IceInternal/TraceUtil.java b/java/src/IceInternal/TraceUtil.java
index 24d5b1be764..fbbb3defcf3 100644
--- a/java/src/IceInternal/TraceUtil.java
+++ b/java/src/IceInternal/TraceUtil.java
@@ -13,7 +13,7 @@ package IceInternal;
final class TraceUtil
{
static void
- traceHeader(String heading, Ice.Stream stream, Ice.Logger logger,
+ traceHeader(String heading, BasicStream stream, Ice.Logger logger,
TraceLevels tl)
{
if (tl.protocol >= 1)
@@ -27,7 +27,7 @@ final class TraceUtil
}
static void
- traceRequest(String heading, Ice.Stream stream, Ice.Logger logger,
+ traceRequest(String heading, BasicStream stream, Ice.Logger logger,
TraceLevels tl)
{
if (tl.protocol >= 1)
@@ -53,7 +53,7 @@ final class TraceUtil
}
static void
- traceBatchRequest(String heading, Ice.Stream stream, Ice.Logger logger,
+ traceBatchRequest(String heading, BasicStream stream, Ice.Logger logger,
TraceLevels tl)
{
if (tl.protocol >= 1)
@@ -83,7 +83,7 @@ final class TraceUtil
}
static void
- traceReply(String heading, Ice.Stream stream, Ice.Logger logger,
+ traceReply(String heading, BasicStream stream, Ice.Logger logger,
TraceLevels tl)
{
if (tl.protocol >= 1)
@@ -144,7 +144,7 @@ final class TraceUtil
}
private static void
- printHeader(java.io.Writer out, Ice.Stream stream)
+ printHeader(java.io.Writer out, BasicStream stream)
{
byte protVer = stream.readByte();
out.write("\nprotocol version = " + (int)protVer);
diff --git a/java/src/IceInternal/UdpEndpoint.java b/java/src/IceInternal/UdpEndpoint.java
index 61366eef6e5..a471a043953 100644
--- a/java/src/IceInternal/UdpEndpoint.java
+++ b/java/src/IceInternal/UdpEndpoint.java
@@ -89,7 +89,7 @@ public final class UdpEndpoint extends Endpoint
}
public
- UdpEndpoint(Ice.Stream s)
+ UdpEndpoint(BasicStream s)
{
s.startReadEncaps();
_host = s.readString();
@@ -101,7 +101,7 @@ public final class UdpEndpoint extends Endpoint
// Marshal the endpoint
//
public void
- streamWrite(Ice.Stream s)
+ streamWrite(BasicStream s)
{
s.writeShort(UdpEndpointType);
s.startWriteEncaps();
diff --git a/java/src/IceInternal/UnknownEndpoint.java b/java/src/IceInternal/UnknownEndpoint.java
index de8f4af99b1..c670445895d 100644
--- a/java/src/IceInternal/UnknownEndpoint.java
+++ b/java/src/IceInternal/UnknownEndpoint.java
@@ -13,7 +13,7 @@ package IceInternal;
public final class UnknownEndpoint extends Endpoint
{
public
- UnknownEndpoint(Ice.Stream s)
+ UnknownEndpoint(BasicStream s)
{
_rawBytes = s.readByteSeq();
}
@@ -22,7 +22,7 @@ public final class UnknownEndpoint extends Endpoint
// Marshal the endpoint
//
public void
- streamWrite(Ice.Stream s)
+ streamWrite(BasicStream s)
{
s.writeShort(UnknownEndpointType);
s.writeByteSeq(_rawBytes);
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 02:59:54 +0000