Skip to content

Commit ca6ccc7

Browse files
committed
debug_output can return a string 32, so avoid truncated unicode value by returning a string 32 value for `debug_output' .
1 parent bb11c24 commit ca6ccc7

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

library/server/wsf/router/wsf_router_item.e

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ note
33
Entry of WSF_ROUTER
44
It contains
55
- mapping
6-
- request methods
7-
6+
- request methods
7+
88
]"
99
date: "$Date$"
1010
revision: "$Revision$"
@@ -40,20 +40,23 @@ feature -- Access
4040

4141
feature -- Status report
4242

43-
debug_output: STRING
43+
debug_output: READABLE_STRING_GENERAL
4444
-- String that should be displayed in debugger to represent `Current'.
45+
local
46+
s: STRING_32
4547
do
46-
create Result.make_from_string (mapping.debug_output)
48+
create s.make_from_string_general (mapping.debug_output)
4749
if attached request_methods as mtds then
48-
Result.append_string (" [ ")
50+
s.append_string (" [ ")
4951
across
5052
mtds as c
5153
loop
52-
Result.append_string (c.item)
53-
Result.append_string (" ")
54+
s.append_string (c.item)
55+
s.append_string (" ")
5456
end
55-
Result.append_string ("]")
57+
s.append_string ("]")
5658
end
59+
Result := s
5760
end
5861

5962
feature -- Change
@@ -68,7 +71,7 @@ invariant
6871
mapping_attached: mapping /= Void
6972

7073
note
71-
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
74+
copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
7275
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
7376
source: "[
7477
Eiffel Software

library/server/wsf/router/wsf_router_mapping.e

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ feature -- Documentation
4848

4949
feature -- Status report
5050

51-
debug_output: STRING
51+
debug_output: READABLE_STRING_GENERAL
5252
-- String that should be displayed in debugger to represent `Current'.
5353
do
54-
Result := description.as_string_8 + " : " + associated_resource
54+
Result := description + {STRING_32} " : " + associated_resource.to_string_32
5555
end
5656

5757
feature -- Status
@@ -88,7 +88,7 @@ feature -- Helper
8888
end
8989

9090
note
91-
copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
91+
copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
9292
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
9393
source: "[
9494
Eiffel Software

library/server/wsf/router_context/support/starts_with/wsf_starts_with_context_mapping.e

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ feature {NONE} -- Execution
4545

4646
feature -- Status report
4747

48-
debug_output: STRING
48+
debug_output: READABLE_STRING_GENERAL
4949
-- String that should be displayed in debugger to represent `Current'.
5050
do
5151
Result := Precursor + " {" + ({C}).name + "}"
5252
end
5353

5454
note
55-
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
55+
copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
5656
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
5757
source: "[
5858
Eiffel Software

library/server/wsf/router_context/wsf_router_context_mapping.e

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ feature -- Access
2222

2323
feature -- Status report
2424

25-
debug_output: STRING
25+
debug_output: READABLE_STRING_GENERAL
2626
-- String that should be displayed in debugger to represent `Current'.
2727
do
2828
Result := Precursor + " {" + ({C}).name + "}"
2929
end
3030

3131
note
32-
copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others"
32+
copyright: "2011-2014, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Colin Adams, Eiffel Software and others"
3333
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
3434
source: "[
3535
Eiffel Software

0 commit comments

Comments
 (0)