/[Apache-SVN]
ViewVC logotype

Revision 1441385


Jump to revision: Previous Next
Author: philharveyonline
Date: Fri Feb 1 11:11:29 2013 UTC (11 years, 3 months ago)
Changed paths: 8
Log Message:
NO-JIRA: Merged latest from trunk to this branch jni-binding with commands:

$ svn merge https://svn.apache.org/repos/asf/qpid/proton/trunk .                                                                                            
--- Merging r1441000 through r1441381 into '.':
U    proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
U    proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
U    proton-j/proton/src/main/java/org/apache/qpid/proton/driver/impl/ConnectorImpl.java
   C proton-j/proton/src/main/scripts
U    proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Delivery.java
--- Recording mergeinfo for merge of r1421251 through r1441381 into '.':
 U   .
Summary of conflicts:
  Tree conflicts: 1

$ svn merge -c 1441176 https://svn.apache.org/repos/asf/qpid/proton/trunk/proton-j/proton/src/main/scripts/proton.py ./proton-j/proton-api/src/main/resources/proton.py
--- Merging r1441176 into 'proton-j/proton-api/src/main/resources/proton.py':
U    proton-j/proton-api/src/main/resources/proton.py
--- Recording mergeinfo for merge of r1441176 into 'proton-j/proton-api/src/main/resources/proton.py':
 U   proton-j/proton-api/src/main/resources/proton.py


To resolve conflicts, we had to add JNIDelivery.isPartial(), use MessengerFactory in Java proton.py, and catch ProtonUnsupportedOperation in Messenger test.



Changed paths

Path Details
Directoryqpid/proton/branches/jni-binding/ modified , props changed
Directoryqpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIDelivery.java modified , text changed
Directoryqpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessengerFactory.java modified , text changed
Directoryqpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/driver/impl/ConnectorImpl.java modified , text changed
Directoryqpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java modified , text changed
Directoryqpid/proton/branches/jni-binding/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java modified , text changed
Directoryqpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Delivery.java modified , text changed
Directoryqpid/proton/branches/jni-binding/proton-j/proton-api/src/main/resources/proton.py modified , text changed , props changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26