Skip to content

Commit c95c078

Browse files
authored
Merge pull request #66 from Flexiana/update_framework_version
update framework version
2 parents ee8edba + 86144fc commit c95c078

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

src/framework/components/app/core.clj

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
(defn add-session-backend
2020
[state session-backend]
2121
(xiana/ok
22-
(update state :deps conj session-backend)))
22+
(if session-backend
23+
(update state :deps conj session-backend)
24+
state)))
2325

2426
(defn add-http-request
2527
[state http-request]
@@ -73,7 +75,9 @@
7375

7476
(defn init-acl
7577
[this config]
76-
(acl-builder/init this config))
78+
(if config
79+
(acl-builder/init this config)
80+
this))
7781

7882
(defrecord App
7983
[config acl-cfg session-backend router db]
@@ -101,7 +105,11 @@
101105
(get :response))))))
102106

103107
(defn make-app
104-
[config acl-cfg session-backend router-interceptors controller-interceptors]
108+
[{config :config
109+
acl-cfg :acl-cfg
110+
session-backend :session-backend
111+
router-interceptors :router-interceptors
112+
controller-interceptors :controller-interceptors}]
105113
(map->App {:config config
106114
:acl-cfg acl-cfg
107115
:session-backend session-backend

0 commit comments

Comments
 (0)