Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
e032fd06
Commit
e032fd06
authored
Oct 04, 2011
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Убрал "вылет" при недоступности локального omniNames. Т.к. он нужен не всегда.
parent
0fea89d8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
6 deletions
+22
-6
libuniset.spec
conf/libuniset.spec
+4
-1
UniversalInterface.cc
src/Interfaces/UniversalInterface.cc
+18
-5
No files found.
conf/libuniset.spec
View file @
e032fd06
...
...
@@ -3,7 +3,7 @@
Name: libuniset
Version: 1.0
Release: alt4
4
Release: alt4
5
Summary: UniSet - library for building distributed industrial control systems
License: GPL
Group: Development/C++
...
...
@@ -207,6 +207,9 @@ rm -f %buildroot%_libdir/*.la
%changelog
* Tue Oct 04 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt45
- dependence on mandatory disabled launching a local omninames service
* Mon Oct 03 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt44
- add nodes filter for UNet2
- minor optimization
...
...
src/Interfaces/UniversalInterface.cc
View file @
e032fd06
...
...
@@ -89,15 +89,15 @@ void UniversalInterface::init()
}
catch
(
Exception
&
ex
)
{
if
(
!
uconf
->
isLocalIOR
()
)
throw
ex
;
//
if( !uconf->isLocalIOR() )
//
throw ex;
localctx
=
CosNaming
::
NamingContext
::
_nil
();
}
catch
(
...
)
{
if
(
!
uconf
->
isLocalIOR
()
)
throw
;
//
if( !uconf->isLocalIOR() )
//
throw;
localctx
=
CosNaming
::
NamingContext
::
_nil
();
}
...
...
@@ -1692,7 +1692,20 @@ ObjectPtr UniversalInterface::resolve( ObjectId rid , ObjectId node, int timeout
}
}
else
ctx
=
localctx
;
{
if
(
CORBA
::
is_nil
(
localctx
)
)
{
if
(
CORBA
::
is_nil
(
orb
)
)
{
CORBA
::
ORB_var
_orb
=
uconf
->
getORB
();
localctx
=
ORepHelpers
::
getRootNamingContext
(
_orb
,
oind
->
getRealNodeName
(
uconf
->
getLocalNode
())
);
}
else
localctx
=
ORepHelpers
::
getRootNamingContext
(
orb
,
oind
->
getRealNodeName
(
uconf
->
getLocalNode
())
);
}
else
ctx
=
localctx
;
}
CosNaming
::
Name_var
oname
=
omniURI
::
stringToName
(
oind
->
getNameById
(
rid
,
node
).
c_str
()
);
for
(
unsigned
int
i
=
0
;
i
<
uconf
->
getRepeatCount
();
i
++
)
...
...
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