[
http://issues.apache.org/jira/browse/DERBY-847?page=comments#action_12413027 ]
Dag H. Wanvik commented on DERBY-847:
-------------------------------------
Thanks for addressing my concerns!
There is one remaining merge conflict section in
java/engine/org/apache/derby/loc/messages_en.properties:
+<<<<<<< .mine
+J128=the cursor is not open
+=======
J128=an Open Query command was issued for a query which was already open
J129=A PROTOCOL Invalid FDOCA Description Error was detected
+>>>>>>> .r408974
While you are at it, my patch checking script found this long line added :-)
++ java/client/org/apache/derby/client/am/CloseFilterInputStream.java
(working copy)
SqlException.getMessageUtil().getTextMessage(MessageId.CONN_ALREADY_CLOSED);
As for the grouping, I guess you can just change the header a bit:
# 2D - DRDA exceptions
->
# 2D, 24 - DRDA exceptions
Otherwise, I say it's ready to go!
> Internationalize NetIndoubtTransaction to NetSqlca in
> org.apache.derby.client.net
> ---------------------------------------------------------------------------------
>
> Key: DERBY-847
> URL: http://issues.apache.org/jira/browse/DERBY-847
> Project: Derby
> Type: Sub-task
> Components: Network Client
> Reporter: David Van Couvering
> Assignee: David Van Couvering
> Attachments: DERBY-847-1.diff, DERBY-847-2.diff
>
--
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see:
http://www.atlassian.com/software/jira
