Permalink
Browse files

fix bug at identity exchange with inproc

  • Loading branch information...
1 parent da4bc14 commit dd611284338c3b550eb9c24c2976e51cf26fdd36 @miniway committed Nov 18, 2012
Showing with 5 additions and 33 deletions.
  1. +1 −1 pom.xml
  2. +0 −28 src/main/java/zmq/IZmqMonitor.java
  3. +4 −4 src/main/java/zmq/SocketBase.java
View
2 pom.xml
@@ -7,7 +7,7 @@
<version>0.2.0-SNAPSHOT</version>
<name>JeroMQ</name>
<description>zeromq POJO implementation</description>
- <url>https://github.com/miniway/jeromq</url>
+ <url>https://github.com/zeromq/jeromq</url>
<licenses>
<license>
<name>GNU General Lesser Public License (LGPL) version 3.0</name>
View
28 src/main/java/zmq/IZmqMonitor.java
@@ -1,28 +0,0 @@
-/*
- Copyright (c) 2007-2012 iMatix Corporation
- Copyright (c) 2009-2011 250bpm s.r.o.
- Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
-
- This file is part of 0MQ.
-
- 0MQ is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- 0MQ is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package zmq;
-
-public interface IZmqMonitor {
-
- void monitor(SocketBase socket_, int event_, Object[] args_);
-
-}
View
8 src/main/java/zmq/SocketBase.java
@@ -455,8 +455,8 @@ public boolean connect (String addr_)
// If required, send the identity of the peer to the local socket.
if (peer.options.recv_identity) {
- Msg id = new Msg(peer.options.identity_size);
- id.put(peer.options.identity, 0 , peer.options.identity_size);
+ Msg id = new Msg (options.identity_size);
+ id.put (options.identity, 0 , options.identity_size);
id.set_flags (Msg.identity);
boolean written = pipes [0].write (id);
assert (written);
@@ -465,8 +465,8 @@ public boolean connect (String addr_)
// If required, send the identity of the local socket to the peer.
if (options.recv_identity) {
- Msg id = new Msg(options.identity_size);
- id.put(options.identity, 0 , options.identity_size);
+ Msg id = new Msg (peer.options.identity_size);
+ id.put (peer.options.identity, 0 , peer.options.identity_size);
id.set_flags (Msg.identity);
boolean written = pipes [1].write (id);
assert (written);

0 comments on commit dd61128

Please sign in to comment.