diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-11-12 12:36:53 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-11-12 12:36:53 (GMT) |
| commit | ba6950d9968f151247d873b414c3ff0fd513f4ca (patch) | |
| tree | 3fe89794507f107bb972a32299479a6f6d918b4e | |
| parent | 8202b54c5d3ce1fbc4f079918551f2f076a221cb (diff) | |
| parent | a0cf3d349c60b6d2daafd27698b8589f4cfbd375 (diff) | |
| download | uscxml-ba6950d9968f151247d873b414c3ff0fd513f4ca.zip uscxml-ba6950d9968f151247d873b414c3ff0fd513f4ca.tar.gz uscxml-ba6950d9968f151247d873b414c3ff0fd513f4ca.tar.bz2 | |
Merge branch 'master' of https://github.com/tklab-tud/uscxml
| -rw-r--r-- | apps/samples/put-that-there/put-that-there.scxml | 4 | ||||
| -rw-r--r-- | test/src/test-w3c.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/samples/put-that-there/put-that-there.scxml b/apps/samples/put-that-there/put-that-there.scxml index 301e34b..00865c4 100644 --- a/apps/samples/put-that-there/put-that-there.scxml +++ b/apps/samples/put-that-there/put-that-there.scxml @@ -34,7 +34,7 @@ <state id="main"> <transition event="http" target="main" type="internal" - cond="_event.data.path Component[1] === 'basichttp' && + cond="_event.data.pathComponent[1] === 'basichttp' && _event.data.pathComponent[2] === 'query'" > <!-- a request for /ptt/basichttp/query --> <script>dump(_event);</script> @@ -85,4 +85,4 @@ </transition> </state> </state> -</scxml>
\ No newline at end of file +</scxml> diff --git a/test/src/test-w3c.cpp b/test/src/test-w3c.cpp index b31eb72..e7caf6e 100644 --- a/test/src/test-w3c.cpp +++ b/test/src/test-w3c.cpp @@ -107,11 +107,11 @@ int main(int argc, char** argv) { exit(EXIT_FAILURE); } - HTTPServer::getInstance(32954, 32955, NULL); // bind to some random tcp sockets for ioprocessor tests - google::InitGoogleLogging(argv[0]); google::LogToStderr(); + HTTPServer::getInstance(32954, 32955, NULL); // bind to some random tcp sockets for ioprocessor tests + char* dfEnv = getenv("USCXML_DELAY_FACTOR"); if (dfEnv) { delayFactor = strTo<double>(dfEnv); @@ -187,4 +187,4 @@ int main(int argc, char** argv) { std::cout << e.what() << std::endl; } return retCode; -}
\ No newline at end of file +} |