raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'master' into pluggable-serializer

Browse source
This commit is contained in:
Jonas Bonér 2011-06-14 14:41:24 +02:00
commit 04bf416ead
80 changed files with 1366 additions and 789 deletions
Download patch file Download diff file Expand all files Collapse all files

26
akka-remote/src/main/java/akka/remote/protocol/RemoteProtocol.java
View file

@ -594,7 +594,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -1388,7 +1388,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -2760,7 +2760,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -3235,7 +3235,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -4062,7 +4062,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -5428,7 +5428,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -5936,7 +5936,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -6401,7 +6401,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -6948,7 +6948,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -7381,7 +7381,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -7784,7 +7784,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -8187,7 +8187,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}
@ -8657,7 +8657,7 @@ public final class RemoteProtocol {
maybeForceBuilderInitialization();
}
private Builder(BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
maybeForceBuilderInitialization();
}