Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadCommandSystem
Commits
044935b5
Commit
044935b5
authored
Feb 10, 2017
by
yannick legoc
Browse files
Replaced Corba DatabaseAccessor with Cameo DatabaseResponder.
parent
f7087a13
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
pom.xml
View file @
044935b5
...
...
@@ -198,11 +198,6 @@
<arg
line=
"${idlFlags} ${idlCoreDir}/ServantManager.idl"
/>
</exec>
<echo
message=
"Generating DatabaseAccessor.java"
/>
<exec
executable=
"idl"
>
<arg
line=
"${idlFlags} ${idlCoreDir}/DatabaseAccessor.idl"
/>
</exec>
<echo
message=
"Generating CommandZoneAccessor.java"
/>
<exec
executable=
"idl"
>
<arg
line=
"${idlFlags} ${idlCoreDir}/commandzone/CommandZoneAccessor.idl"
/>
...
...
@@ -351,6 +346,16 @@
<exec
executable=
"protoc"
>
<arg
line=
"${protoFlags} ${protoDir}/NotificationMessages.proto"
/>
</exec>
<echo
message=
"Generating CommonResponses.java"
/>
<exec
executable=
"protoc"
>
<arg
line=
"${protoFlags} ${protoDir}/CommonResponses.proto"
/>
</exec>
<echo
message=
"Generating DatabaseRequests.java"
/>
<exec
executable=
"protoc"
>
<arg
line=
"${protoFlags} ${protoDir}/DatabaseRequests.proto"
/>
</exec>
</target>
</configuration>
...
...
src/main/java/fr/ill/ics/core/property/Int32Property.java
View file @
044935b5
...
...
@@ -37,6 +37,7 @@ public class Int32Property extends IntegerProperty {
}
public
boolean
setServerValue
(
String
value
)
{
try
{
String
serverValue
=
this
.
propertyFormat
.
unformat
(
value
);
boolean
ok
=
isOk
(
serverValue
);
...
...
src/main/java/fr/ill/ics/nscclient/dataprovider/DataAccessor.java
View file @
044935b5
This diff is collapsed.
Click to expand it.
src/main/java/fr/ill/ics/nscclient/log/LogSubscriber.java
View file @
044935b5
...
...
@@ -219,6 +219,9 @@ public class LogSubscriber {
e
.
printStackTrace
();
}
// Terminate the subscriber.
subscriber
.
terminate
();
System
.
out
.
println
(
"Unsubscribed from the log"
);
}
...
...
src/main/java/fr/ill/ics/nscclient/sessionmanagement/ServerSessionManager.java
View file @
044935b5
...
...
@@ -154,6 +154,8 @@ public class ServerSessionManager {
LogSubscriber
.
getInstance
(
serverId
).
unsubscribe
();
SurveySubcriberImpl
.
getInstance
(
serverId
).
unsubscribe
();
DataAccessor
.
getInstance
(
serverId
).
reset
();
currentSession
.
logout
();
currentSession
=
null
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment