Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
JDChain
Bftsmart
提交
e7393083
B
Bftsmart
项目概览
JDChain
/
Bftsmart
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
B
Bftsmart
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e7393083
编写于
9月 01, 2011
作者:
L
liquidsnake@sapo.pt
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed a small bug on the reconfiguration
上级
0b752909
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
26 deletion
+6
-26
src/navigators/smart/reconfiguration/ReconfigurationManager.java
...igators/smart/reconfiguration/ReconfigurationManager.java
+3
-3
src/navigators/smart/reconfiguration/ReconfigureReply.java
src/navigators/smart/reconfiguration/ReconfigureReply.java
+3
-23
未找到文件。
src/navigators/smart/reconfiguration/ReconfigurationManager.java
浏览文件 @
e7393083
...
...
@@ -159,7 +159,7 @@ public class ReconfigurationManager extends ViewManager {
//ret = reconfigure(updates.get(i).getContent());
return
reconfigure
(
jSetInfo
,
jSet
,
rSet
,
f
,
eid
,
decisionRound
,
null
);
return
reconfigure
(
jSetInfo
,
jSet
,
rSet
,
f
,
eid
,
decisionRound
);
}
private
boolean
contains
(
int
id
,
List
<
Integer
>
list
)
{
...
...
@@ -171,7 +171,7 @@ public class ReconfigurationManager extends ViewManager {
return
false
;
}
private
byte
[]
reconfigure
(
List
<
String
>
jSetInfo
,
List
<
Integer
>
jSet
,
List
<
Integer
>
rSet
,
int
f
,
int
eid
,
int
decisionRound
,
byte
[]
state
)
{
private
byte
[]
reconfigure
(
List
<
String
>
jSetInfo
,
List
<
Integer
>
jSet
,
List
<
Integer
>
rSet
,
int
f
,
int
eid
,
int
decisionRound
)
{
//ReconfigureRequest request = (ReconfigureRequest) TOMUtil.getObject(req);
// Hashtable<Integer, String> props = request.getProperties();
// int f = Integer.valueOf(props.get(CHANGE_F));
...
...
@@ -208,7 +208,7 @@ public class ReconfigurationManager extends ViewManager {
return
TOMUtil
.
getBytes
(
new
ReconfigureReply
(
newV
,
jSetInfo
.
toArray
(
new
String
[
0
]),
tomLayer
.
getLastExec
(),
tomLayer
.
lm
.
getLeader
(
eid
,
decisionRound
)
,
state
));
tomLayer
.
getLastExec
(),
tomLayer
.
lm
.
getLeader
(
eid
,
decisionRound
)));
}
public
TOMMessage
[]
clearUpdates
()
{
...
...
src/navigators/smart/reconfiguration/ReconfigureReply.java
浏览文件 @
e7393083
...
...
@@ -28,17 +28,13 @@ public class ReconfigureReply implements Externalizable {
private
int
execLeader
=
-
1
;
private
byte
[]
startState
;
public
ReconfigureReply
()
{
}
public
ReconfigureReply
(
View
newView
,
String
[]
joinSet
,
int
lastExectConsensus
,
int
leader
,
byte
[]
startState
)
{
public
ReconfigureReply
(
View
newView
,
String
[]
joinSet
,
int
lastExectConsensus
,
int
leader
)
{
this
.
newView
=
newView
;
this
.
lastExecConsId
=
lastExectConsensus
;
this
.
execLeader
=
leader
;
this
.
startState
=
startState
;
if
(
joinSet
==
null
){
this
.
joinSet
=
new
String
[
0
];
...
...
@@ -49,13 +45,7 @@ public class ReconfigureReply implements Externalizable {
public
View
getView
()
{
return
newView
;
}
public
byte
[]
getStartState
()
{
return
this
.
startState
;
}
}
public
String
[]
getJoinSet
()
{
return
joinSet
;
...
...
@@ -84,13 +74,7 @@ public class ReconfigureReply implements Externalizable {
for
(
int
i
=
0
;
i
<
joinSet
.
length
;
i
++){
out
.
writeUTF
(
joinSet
[
i
]);
}
out
.
writeInt
(
startState
.
length
);
out
.
write
(
startState
);
}
}
@Override
...
...
@@ -102,10 +86,6 @@ public class ReconfigureReply implements Externalizable {
for
(
int
i
=
0
;
i
<
joinSet
.
length
;
i
++){
joinSet
[
i
]
=
in
.
readUTF
();
}
this
.
startState
=
new
byte
[
in
.
readInt
()];
in
.
read
(
this
.
startState
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录